commit 31542cc306ea6d7f4ca629fccd9bcd536573f6d8 Merge: 61cb2993d 9cbc40e37 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 1 15:28:17 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

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