Merge branch 'maint-0.3.4'
commit9b0a17a74f5d8cd7c5d8a07dd275e7d96bd4fd35
authorNick Mathewson <nickm@torproject.org>
Fri, 21 Sep 2018 13:36:31 +0000 (21 09:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 21 Sep 2018 13:36:31 +0000 (21 09:36 -0400)
tree4289c92c0b9f2833801dd5f36d3fc48d46d3ac66
parent96d1f2e6d0ebcb97aa66a1416d147533b24fac9c
parente818a7190599ff46184e1b8541b2317c145e6d8d
Merge branch 'maint-0.3.4'
src/core/or/protover.c
src/test/test_protover.c