]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/doc24596'
authorNick Mathewson <nickm@torproject.org>
Tue, 12 Dec 2017 14:07:49 +0000 (09:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 Dec 2017 14:07:49 +0000 (09:07 -0500)

Trivial merge