commit 373b23a9ee80eb81a0d4db9fb6b742a602c8e82d Merge: 4f854dbdc 022b8f15d Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 08:29:54 2018 -0400

Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3

changes/bug26876 | 4 ++++ configure.ac | 32 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-)