[tor-commits] [tor/maint-0.3.3] Merge branch 'bug21394_029_redux' into maint-0.3.3