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