]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.9' into maint-0.3.2 maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Fri, 21 Sep 2018 13:35:23 +0000 (09:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 21 Sep 2018 13:35:23 +0000 (09:35 -0400)
commit5b04392c1553e2a3e278a48f8d0e071181c0444f
tree1555f57ec4b2ec1f9f7197361c601625cc8f6d9e
parent0971b3ce4d03929ef09838209ab87de4f9dfcf1f
parente24195c7c1aaecebaf5ef4f81b54da2f0db917c6
Merge branch 'maint-0.2.9' into maint-0.3.2
src/or/protover.c
src/test/test_protover.c