commit 9773cd0f94d20c810f37021e475c132d611ef063 Merge: 51377a917 31542cc30 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 1 15:28:17 2018 -0500

Merge branch 'maint-0.3.2'

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