commit 796b1e73e73f447b1f93b17179dd7ab31c618929 Merge: 0431bb61c 2cadd93ce Author: David Goulet <dgoulet@torproject.org> Date: Mon Sep 24 12:44:59 2018 -0400 Merge branch 'maint-0.3.3' of https://git.torproject.org/tor into maint-0.3.3 changes/bug27316 | 3 +++ src/or/protover.c | 17 ++++++++++++++++- src/test/test_protover.c | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-)