[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'catalyst-github/bug25629-032' into maint-0.3.2