[tor-commits] [tor/master] Merge branch 'tor-github/pr/976'

[dgoulet at torproject.org]

commit 2f44786e304ae275501c1e3f74709435ae931def
Merge: 501d1ae0b f35bd3681
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon May 13 07:34:00 2019 -0400

    Merge branch 'tor-github/pr/976'

 changes/ticket27251 | 4 ++++
 src/test/include.am | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)