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

[nickm at torproject.org]

commit bc89ef0ca8164f9e6e23e73c01bdb4257fdbce7c
Merge: 21ed575 9674fe7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 17 19:51:53 2011 -0400

    Merge branch 'bug2752' into maint-0.2.2

 changes/bug2752     |    5 +++++
 src/or/config.c     |    8 ++++----
 src/or/connection.c |   13 +++++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)