[tor-commits] [tor/master] minor cleanups on commit 17daab76