[tor-commits] [tor/maint-0.4.0] Merge branch 'bug29959_040_squashed' into maint-0.4.0