[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2