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

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