[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9