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