commit 08aaedb0151684c31ace7ecabc9184b7cc018352 Merge: 4149b1554 e818a7190 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 21 09:35:54 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27316 | 3 +++ src/or/protover.c | 17 ++++++++++++++++- src/test/test_protover.c | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-)