[tor-commits] [tor/release-0.2.2] minor cleanups while reviewing 3216