]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'
authorNick Mathewson <nickm@torproject.org>
Mon, 12 Jan 2015 19:06:14 +0000 (14:06 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 12 Jan 2015 19:06:14 +0000 (14:06 -0500)
1  2 
src/common/util.c
src/or/config.c

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