[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1885/head'

commit 86b5bcd80ad27083c9b8e5c5999927f235905ec6 Merge: b7a165228 cc169eb12 Author: Nick Mathewson <nickm@torproject.org> Date: Tue May 12 12:52:41 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1885/head' changes/doc34133 | 6 ++++++ doc/tor.1.txt | 6 ++++++ 2 files changed, 12 insertions(+)