commit fcd26af7c0b9926f8e56149a72de9dd47ad37a69 Merge: dd69e74e3 47ee7978f Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 09:21:55 2018 -0400

Merge branch 'feature26372_029' into maint-0.2.9

changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)