[tor-commits] [tor/master] Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2

[nickm at torproject.org]

commit f3b58dfa53d87656f558a97bc28a333bdea06017
Merge: a0514ba 91aa6f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 25 19:03:15 2011 -0400

    Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2

 changes/bug2971 |    6 ++++++
 src/or/config.c |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)