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