commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c Merge: fea35ddf0 42c6ebda1 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)