[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2

[nickm at torproject.org]

commit 09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57
Merge: 0b3166f cd42ae7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 9 13:37:56 2011 -0400

    Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2

 changes/bug3022        |    6 ++++++
 doc/tor.1.txt          |    6 ++++++
 src/or/config.c        |    1 +
 src/or/directory.c     |    1 +
 src/or/networkstatus.c |    2 +-
 src/or/or.h            |    4 +++-
 6 files changed, 18 insertions(+), 2 deletions(-)