[tor-commits] [tor/master] Merge remote-tracking branch 'sysrqb/bug9859_5'

[nickm at torproject.org]

commit 03da9be2f13c0cca9bb35e2aba9bf0876f40db33
Merge: e716565 b36f93a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 20 11:03:37 2013 -0500

    Merge remote-tracking branch 'sysrqb/bug9859_5'

 changes/bug9859        |    6 ++++++
 src/or/dirserv.c       |   19 +++++++++++++++++++
 src/or/dirserv.h       |    1 +
 src/or/networkstatus.c |   10 +++++++++-
 4 files changed, 35 insertions(+), 1 deletion(-)