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

[nickm at torproject.org]

commit 5dc3c462dcf42488055685e7f4fdb4a1a48003f1
Merge: 4b57ec6 6802499
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 30 12:43:25 2011 -0400

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

 changes/bug3228 |    3 +++
 src/or/config.c |   23 +++++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)