commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 15 12:20:53 2018 -0400

Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9

changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)