commit 5b04392c1553e2a3e278a48f8d0e071181c0444f Merge: 0971b3ce4 e24195c7c Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 21 09:35:23 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

changes/bug27316 | 3 +++ src/or/protover.c | 15 +++++++++++++++ src/test/test_protover.c | 4 ++++ 3 files changed, 22 insertions(+)