]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'unixninja_ticket15989_squashed'
authorNick Mathewson <nickm@torproject.org>
Fri, 8 Jan 2016 23:52:22 +0000 (15:52 -0800)
committerNick Mathewson <nickm@torproject.org>
Fri, 8 Jan 2016 23:52:22 +0000 (15:52 -0800)
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