[tor-commits] [tor/master] Merge branch 'maint-0.4.0'