]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug1751_enabling' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 21:08:03 +0000 (17:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 21:08:03 +0000 (17:08 -0400)
1  2 
src/or/config.c
src/or/or.h

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