[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2