[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1

[nickm at torproject.org]

commit 9cbc40e37675e77a654bad88f99959873759b9fd
Merge: 5fc0437e7 9656ad323
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 1 15:28:11 2018 -0500

    Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1

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