commit bcfb034957dbd5d891befcd99a9725a225903b4e Merge: bd71e0a0c ac1942ac5 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

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