]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug1692-squashed'
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Aug 2011 19:04:36 +0000 (15:04 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Aug 2011 19:04:36 +0000 (15:04 -0400)
1  2 
src/common/util.c
src/or/config.c

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