[tor-commits] [tor/master] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5