commit ec97319464aab204740acb013b504abb0e13d989 Merge: a01736e 634d24c Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 9 23:50:09 2012 -0400

Merge branch 'bug7014_squashed'

changes/bug7014 | 5 +++++ src/or/transports.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)