Please merge my comment-only changes in comments-20151213 on https://github.com/teor2345/tor.git