[tor-commits] [tor/master] bug3155 changes file