[tor-commits] [goptlib/master] Merge branch 'bug15240'

[yawning at torproject.org]

commit 9b7a7002582f1060703aa85bbbe4a422447d0c6e
Merge: e7c3b80 d9f777f
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Thu Mar 12 22:28:45 2015 +0000

    Merge branch 'bug15240'
    
    Workaround for tor bug #15240.

 pt.go |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)