]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug26004_029_squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 8 May 2018 18:26:05 +0000 (14:26 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 May 2018 18:26:05 +0000 (14:26 -0400)
1  2 
src/or/dirserv.c
src/test/test_dir.c

Simple merge
Simple merge