[tor-commits] [tor/release-0.3.1] Merge branch 'bug21394_029' into maint-0.2.9