commit 14ec62f0640df3007e442e937428f2839f1eb745 Merge: 432620e44 dd63033fc Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)