[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4