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