]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'feature17576-UseDefaultFallbackDirs-v2-squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 15 Dec 2015 17:19:08 +0000 (12:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 15 Dec 2015 17:19:08 +0000 (12:19 -0500)
1  2 
doc/tor.1.txt
src/or/config.c
src/or/or.h

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