[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5