Merge branch 'pr_1643_squashed'

This commit is contained in:
Nick Mathewson
2020-01-13 13:26:23 -05:00
2 changed files with 575 additions and 556 deletions
+3
View File
@@ -0,0 +1,3 @@
o Documentation (manpage):
- Alphabetize the Client Options section of the tor manpage.
Closes ticket 32846.
+572 -556
View File
File diff suppressed because it is too large Load Diff