[tor-commits] [tor/master] Merge branch 'bug30894_035' into ticket30893

[dgoulet at torproject.org]

commit 7c6cc470f181cc2e9d8e3f6e2a36611de6fb0fdd
Merge: 4613159c6 4ab1d1c0c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 15 16:50:02 2019 -0400

    Merge branch 'bug30894_035' into ticket30893

 changes/bug30894           | 4 ++++
 src/app/config/confparse.c | 1 +
 2 files changed, 5 insertions(+)