[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4

[nickm at torproject.org]

commit 5959d1c10581399efb46eeb6c0de66547894ed65
Merge: 3f837d4 0164f16
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 15:17:11 2013 -0400

    Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4

 changes/bug8273     |    3 +
 changes/bug8435     |    4 +
 src/or/config.c     |    1 +
 src/or/dirserv.c    |  288 ++++++++++++++++++++++++++++++++++++++++++++++++---
 src/or/dirserv.h    |   13 +++
 src/or/or.h         |    4 +
 src/test/test_dir.c |   78 ++++++++++++++
 7 files changed, 375 insertions(+), 16 deletions(-)