[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5

[teor at torproject.org]

commit 31fb2bceb546fb84899e5c797e3f101b86dd8687
Merge: 789fdbed0 c09e7a4e7
Author: teor <teor at torproject.org>
Date:   Mon Aug 12 09:53:59 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5

 changes/bug29875                | 11 +++++++++++
 src/app/config/config.c         |  3 ++-
 src/feature/client/entrynodes.c |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)