[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1557'

[teor at torproject.org]

commit e6ceded7d8f241d08bc4e7eb8321b83e055e020a
Merge: d9d75d4ae ff7d0ebcf
Author: teor <teor at torproject.org>
Date:   Mon Nov 25 12:24:22 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1557'

 src/app/config/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)