[tor-commits] [tor/release-0.3.0] Merge branch 'bug21943_029' into maint-0.2.9