[tor-commits] [tor/release-0.2.2] remove changes for bug6094, since it wasn't released here