commit 0392c104f888e4ad0cda8c6b696905c3a548250a Merge: 9ba12d1a1 e24195c7c Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 21 09:35:23 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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