commit 8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c Merge: 6384d314f bcfb03495 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

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