[tor-commits] [tor/release-0.3.4] Merge branch 'feature26372_029' into maint-0.2.9