[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9