commit 62c88a60111fa4bbd23cfe7bb604b827981cc81c Merge: fc22bcadb 8a5cb58ad Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.3'

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