[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit 683776bfab21ec48d967d8589412f81c6b39afe6
Merge: 599b53f04 c389c4129
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 21 08:36:48 2018 -0400

    Merge branch 'maint-0.3.4'

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