]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'asn/bug4567_rebased'
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Sep 2012 14:12:28 +0000 (10:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Sep 2012 14:12:28 +0000 (10:12 -0400)
1  2 
src/common/util.c
src/or/config.c

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