commit 08e525c198c52bb57f154e79326a9b123ef55d91 Merge: 80b9a589b 19b53e264 Author: Nick Mathewson nickm@torproject.org Date: Thu May 3 16:52:09 2018 -0400

Merge remote-tracking branch 'github/ticket25995'

changes/ticket25995 | 5 +++++ src/test/test.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+)