torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bug33195_master' into ticket33280_master

Browse Source 
Conflicts:
* Keep the changes from ticket33280_master
This commit is contained in:
teor
2020-02-17 13:46:09 +10:00
parent 25ecdf1409 c34c101212
commit 334469cc39
7 changed files with 338 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/ticket33188
+5
View File
@@ -0,0 +1,5 @@
o Documentation (manpage):
- Alphabetize the Server and Directory server sections of the tor
manpage. Also split Statistics options into their own section
of the manpage. Closes ticket 33188. Work by Swati Thacker as
part of Google Season of Docs.