]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug23954_squashed'
authorNick Mathewson <nickm@torproject.org>
Wed, 31 Jan 2018 19:37:48 +0000 (14:37 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 31 Jan 2018 19:37:48 +0000 (14:37 -0500)
1  2 
src/or/config.c
src/or/main.c

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