[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1