]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4
authorteor <teor@torproject.org>
Fri, 19 Apr 2019 01:44:38 +0000 (11:44 +1000)
committerteor <teor@torproject.org>
Fri, 19 Apr 2019 01:44:38 +0000 (11:44 +1000)
1  2 
doc/tor.1.txt
src/or/router.c

diff --cc doc/tor.1.txt
Simple merge
diff --cc src/or/router.c
Simple merge