[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug7292'

[nickm at torproject.org]

commit 39a0a2c3ae8c93ceed42f6d2d1143002c231fc16
Merge: 2b78161 37f8a22
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 4 21:54:19 2012 -0500

    Merge remote-tracking branch 'asn/bug7292'

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