[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8