[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'isis/bug26245' into maint-0.3.4