commit db9ce36b2576144c0fd2ab48de1915cdb008bd2a Merge: 7761c1d d0243e8 Author: Nick Mathewson nickm@torproject.org Date: Sat Jun 23 15:37:57 2012 -0400

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

changes/bug5099 | 3 +++ src/or/transports.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-)