[tor-commits] [tor/maint-0.2.2] Merge commit 'sebastian/bug2663' into maint-0.2.2