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