[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

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