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

[dgoulet at torproject.org]

commit e13e2012b9d1bbde73bea22d9fd13fb0b88c04de
Merge: 327bb0e2c 37aae2394
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu May 23 09:40:07 2019 -0400

    Merge branch 'tor-github/pr/1034'

 changes/ticket29617     | 4 ++++
 src/feature/relay/dns.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)