[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm at torproject.org]

commit 1ef8023e000d9136b7069515f9d7303810a8f3b2
Merge: f48fb8a72 719b5c1d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 8 10:11:57 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26196  |  4 ++++
 src/or/protover.c | 13 +++++++++++++
 2 files changed, 17 insertions(+)