Merge remote-tracking branch 'tor-github/pr/1711'

05a05773 · Nick Mathewson · 5e6021bd · cb757b30 · 05a05773 · 05a05773
Commit 05a05773 authored Feb 10, 2020 by Nick Mathewson 🌻
--- a/changes/ticket32928
+++ b/changes/ticket32928
+  o Documentation (manpage):
+    - Split Circuit Timeout options into their own section of the tor
+      manpage.  Closes ticket 32928.  Work by Swati Thacker as part of
+      Google Season of Docs.
+    - Split Node selection options into their own section of the tor
+      manpage.  Closes ticket 32929.  Work by Swati Thacker as part of
+      Google Season of Docs.
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt