[tor-commits] [tor/maint-0.3.0] Merge remote-tracking branch 'teor/bug20711' into maint-0.3.0