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

[nickm at torproject.org]

commit 6f238a44d8016380cdf47c666185565149ac3b46
Merge: 6d0309e48 9cbc40e37
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 1 15:28:17 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug25070  | 3 +++
 src/or/protover.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)