[tor-commits] [tor/master] Merge branch 'bug5082_squashed'

[nickm at torproject.org]

commit 2aa1a6baa320d2d9a63d5ed3222ea95ef5ac00dc
Merge: 15309cb 9341470
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 12 23:40:23 2012 -0500

    Merge branch 'bug5082_squashed'

 changes/bug5082     |    6 ++++++
 src/or/transports.c |   46 +++++++++++++++++++++-------------------------
 2 files changed, 27 insertions(+), 25 deletions(-)