[tor-commits] [tor/release-0.2.2] fixups on the bug1090-general changes