[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5