[tor-commits] [tor/master] Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2