Merge feature 18483 cleaup commits to master
My branch feature18483-cleanup on https://github.com/teor2345/tor.git has commits that don't change behaviour, and don't need to go in 0.2.8.
They can be merged to master instead, once feature18483-028 is merged.