[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit a610ebc3a6990261f1cd4ac7c498a3fe8a6c1a53
Merge: d0e7c54 0fd3ad7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 1 11:08:28 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

 changes/bug3318      |    3 +++
 src/or/config.c      |   23 +++++++++++------------
 src/or/routerparse.c |    2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)