[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit c27bb4072ca25b154e100158f819315bd8683ce0
Merge: fa1890e97 dd63033fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 8 10:11: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(+)