]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug4244b_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 18 Sep 2014 19:31:08 +0000 (15:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 18 Sep 2014 19:31:08 +0000 (15:31 -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