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

[nickm at torproject.org]

commit 13f60e16eb8639d812d50012dc364d4c061bcb04
Merge: f6cc8f0 22ec4d5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 6 16:19:41 2011 -0400

    Merge remote-tracking branch 'public/bug2381'

 src/or/directory.c     |   18 +++++++++++-------
 src/or/networkstatus.c |    2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)