[tor-commits] [tor/master] Use a smarter fix for bug 1203.