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

[nickm at torproject.org]

commit 1a4876587eb351d51208c5dd93aa37a1e021b8cf
Merge: df37b9333 31542cc30
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 1 15:28:17 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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