]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'sebastian/coverity'
authorNick Mathewson <nickm@torproject.org>
Sat, 12 Dec 2009 07:10:19 +0000 (02:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 12 Dec 2009 07:10:19 +0000 (02:10 -0500)
1  2 
src/common/crypto.c
src/or/config.c
src/or/directory.c

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