[tor-commits] [tor/master] Merge branch 'bug3228_squashed' into maint-0.2.2

[nickm at torproject.org]

commit 6802499413f8efd98ad4d578e5ef937cb55c1edc
Merge: 16cfca5 f08f0e9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 30 12:42:08 2011 -0400

    Merge branch 'bug3228_squashed' into maint-0.2.2

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