Commit 05a05773 authored by Nick Mathewson's avatar Nick Mathewson 🐦
Browse files

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

parents 5e6021bd cb757b30
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.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment