commit 15309cbc49135f01041f66453d29e8fb2fdfd5e8 Merge: d7d6da2 01acce6 Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 12 23:32:53 2012 -0500

Merge branch 'bug5084_squashed'

changes/bug5084 | 4 +++ src/or/transports.c | 67 +++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 12 deletions(-)