]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'disable_ns_macro'
authorNick Mathewson <nickm@torproject.org>
Thu, 9 Jan 2020 21:02:41 +0000 (16:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 9 Jan 2020 21:02:41 +0000 (16:02 -0500)
1  2 
src/test/test_dir.c

Simple merge