]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug13736'
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 17:46:50 +0000 (13:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 17:46:50 +0000 (13:46 -0400)
1  2 
src/common/crypto.c
src/or/config.c
src/or/or.h

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