[tor-commits] [tor/master] Merge branch 'ticket30452_035_v3' into ticket30452_041_v3

[dgoulet at torproject.org]

commit 370ea8d23b05fbf725f1474ed734233c3a7197e4
Merge: dd537ba35 0c451b31d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 14 19:55:51 2019 -0400

    Merge branch 'ticket30452_035_v3' into ticket30452_041_v3

 src/app/main/main.c | 1 +
 1 file changed, 1 insertion(+)