Merge branch 'pr_1643_squashed'

Thezone1975 · Jan 13, 2020 · 8b46372 · 8b46372
2 parents 5888db4 + d99e7ce
commit 8b46372
Show file tree

Hide file tree

Showing 2 changed files with 649 additions and 630 deletions.
diff --git a/changes/ticket32846 b/changes/ticket32846
@@ -0,0 +1,3 @@
+  o Documentation (manpage):
+    - Alphabetize the Client Options section of the tor manpage.
+      Closes ticket 32846.