commit fd8beab4ddfa5b26da405705bed64570ceab7925 Merge: dd62cb788 c09e7a4e7 Author: Nick Mathewson nickm@torproject.org Date: Fri May 31 12:40:43 2019 -0400

Merge branch 'bug29875_035' into bug29875_master

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