commit d5f0cbce9016965e9e9cae459c2241bf0fa83cc8 Merge: 4632ad431 42c6ebda1 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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