commit 1c561819832883b869554614de90e3d13ef120a0 Merge: 434942ea5 bcfb03495 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

.gitmodules | 2 +- changes/ticket25323 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)