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

[nickm at torproject.org]

commit 57ff9913b25ff640f4ae45dc9b60bc28c30f53b8
Merge: d9edee3 6171bdd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 2 16:17:52 2011 -0500

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/connection_or.c
    
    The conflict in src/or/connection_or.c is resolved by taking the
    version in master, since e27a26d5 already fixed bug 4531 on master.
    This merge just adds the changes file from 0.2.2.

 changes/bug4531 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)