]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'trove-2018-005_032' into trove-2018-005_033
authorNick Mathewson <nickm@torproject.org>
Tue, 22 May 2018 16:27:15 +0000 (12:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 May 2018 16:27:15 +0000 (12:27 -0400)
commita3a8d80bebdbb8988a2f33dea8b18a41e445c06f
tree9ce3e1b62be136f2b5e886a7013e2f58c58b75b9
parent3d126632430fe60e7ced72bf82cd2c16f297297e
parentd2bc019053058b09b5552d327106d9fbe0acad56
Merge branch 'trove-2018-005_032' into trove-2018-005_033
src/or/dirserv.c
src/or/protover.c
src/or/protover.h
src/test/test_protover.c