[tor-commits] [tor/master] Merge branch 'bug18921_squashed' into maint-0.2.8