[tor-commits] [tor/master] minor cleanups while reviewing 3216