]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commit2edfdc02a29e73a01f360f257d8dfe916a7a5b45
treedccbc5984ff04448ef264d9bcdb404e5f0a85b46
parentcacea9102a2431ce8e7e431629a91a43331ac9f9
parentf8ffb57bc4430ff9bbd7560eecdda4284b2799ba
Merge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'
src/common/util.c
src/or/config.c