[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'teor/bug20864-029' into maint-0.2.9