commit dd63033fcbb960ac563a8f417a7f65e62781d9a9 Merge: 3f3739c6e 1ef8023e0 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)