commit 726f238b723dfaa88df763bec7e923e99430ea87 Merge: 993e314c6 598210509 Author: Nick Mathewson nickm@torproject.org Date: Thu May 3 13:38:46 2018 -0400

Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1

.travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)