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

[nickm at torproject.org]

commit 6be596e2dc04a736221b573f73a6324352f8538a
Merge: 4dd8d81 c5c5f85
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Oct 29 09:22:58 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/config.c

 changes/bug4340 |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)