[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9650'

[nickm at torproject.org]

commit bc0882c868c0cb61ade0f8b500c4392c889d6d0e
Merge: 2ff664e 753a246
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Apr 5 14:53:48 2014 -0400

    Merge remote-tracking branch 'public/bug9650'

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