]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'ffmancera/github/bug23271'
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Dec 2017 15:40:32 +0000 (10:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Dec 2017 15:40:32 +0000 (10:40 -0500)
1  2 
src/or/main.c
src/or/main.h

diff --cc src/or/main.c
Simple merge
diff --cc src/or/main.h
Simple merge