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

[arma at torproject.org]

commit 765f71cf2a6814ecea527148b52a6396f50be4c1
Merge: b08ba1c c08dde7
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Feb 13 00:14:17 2012 -0500

    Merge branch 'tmp'

 src/or/transports.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)