]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket961_squashed'
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Sep 2014 13:05:18 +0000 (09:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Sep 2014 13:05:18 +0000 (09:05 -0400)
1  2 
src/or/config.c
src/test/include.am

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