[tor-commits] [tor/master] Merge branch 'bug1090-manpage-squashed' into bug1090-part1-squashed