commit ded98be45cc9f25cce117ccdb8d948adce397221 Merge: 1a45398 810f7c5 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 2 08:53:17 2017 -0500

Merge remote-tracking branch 'jryans/doc-formatting'

changes/20885 | 3 +++ doc/tor.1.txt | 77 +++++++++++++++++++++++++++++++---------------------------- 2 files changed, 43 insertions(+), 37 deletions(-)