[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1