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

[nickm at torproject.org]

commit a6545d6335cd7829cdc9c0d7ce2e61b775bcca1d
Merge: 8aded5b f3ae628
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Apr 14 21:48:44 2013 -0400

    Merge branch 'bug8683_rebased' into maint-0.2.4

 src/or/dirserv.c     |  184 ++++++++++++++++++++++++--------------------------
 src/or/dirserv.h     |    4 +-
 src/or/dirvote.c     |   42 ++++++------
 src/or/dirvote.h     |    2 +-
 src/or/or.h          |    6 +-
 src/or/routerlist.c  |    4 +-
 src/or/routerparse.c |   35 +++++-----
 src/test/test_dir.c  |  104 ++++++++++++++--------------
 8 files changed, 189 insertions(+), 192 deletions(-)