commit 0e6e902cbc2e98028e58c73f7b1a8dece89fc03f Merge: 5c85ba307 4d9b55907 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 20 11:50:48 2018 -0500

Merge branch 'document_--version'

changes/document_version | 2 ++ doc/tor.1.txt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)