[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma@xxxxxxxxxxxxxx]

commit b4d81f182c7a01e6099dc4e8afe4349c039be745
Merge: 887eba9 a6545d6
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Tue Apr 16 11:09:50 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug5650              |    5 +
 changes/bug7302              |   11 +++
 changes/bug8117              |   13 +++
 changes/bug8185_diagnostic   |    3 +
 changes/bug8587              |    5 +
 changes/fix-geoipexclude-doc |    4 +
 configure.ac                 |   44 ++++++----
 doc/tor.1.txt                |   13 +++-
 src/or/buffers.c             |   17 +++--
 src/or/config.c              |    7 ++
 src/or/connection.c          |   23 +++++-
 src/or/control.c             |    3 +
 src/or/dirserv.c             |  184 ++++++++++++++++++++----------------------
 src/or/dirserv.h             |    4 +-
 src/or/dirvote.c             |   42 +++++-----
 src/or/dirvote.h             |    2 +-
 src/or/or.h                  |   21 ++++-
 src/or/relay.c               |   22 ++++--
 src/or/relay.h               |   10 ++-
 src/or/routerlist.c          |    4 +-
 src/or/routerparse.c         |   35 ++++----
 src/or/status.c              |   11 ++-
 src/test/test.c              |    2 +-
 src/test/test_dir.c          |  104 ++++++++++++------------
 24 files changed, 355 insertions(+), 234 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits