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