commit bf2ffd39781664b6b29a57a1dd1d110368f120ce Merge: 04b5b8709 5b04392c1 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 21 09:35:23 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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