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

[nickm at torproject.org]

commit 3ef40f69937abc105877189fbecd78df67dd2d8e
Merge: 4af82fb 5bea660
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 15 11:42:38 2011 -0500

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

 changes/bug4349        |    4 ++++
 src/or/connection_or.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)