[tor-commits] [tor/maint-0.2.7] Merge branch 'bug17772_024' into maint-0.2.4