]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug19769_19025_029'
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Jan 2017 14:02:48 +0000 (09:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Jan 2017 14:02:48 +0000 (09:02 -0500)
1  2 
src/or/dns.c
src/or/or.h
src/test/test_cell_formats.c

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