commit c389c4129252b49f7e5bd77e1be342cddbe388fb Merge: 46dca2732 7b1a3c516 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 08:36:48 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/bug26435 | 5 +++++ src/or/protover.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)