[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug2297'

[nickm at torproject.org]

commit 517b9c602a9e5e8c60849892a426526e803ef412
Merge: a925fc9 5193752
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 11:14:00 2012 -0400

    Merge remote-tracking branch 'public/bug2297'

 changes/bug2297-related |    6 ++++++
 src/or/dirserv.c        |    9 +++++++++
 src/or/dirserv.h        |    1 +
 src/or/routerlist.c     |    4 ++--
 4 files changed, 18 insertions(+), 2 deletions(-)