commit a63c5f844bcf022f6c83897d111b01344f67b40b Merge: 33382184b 5e594831c Author: David Goulet dgoulet@torproject.org Date: Tue Jun 4 09:57:03 2019 -0400

Merge branch 'tor-github/pr/1067'

changes/bug29875 | 11 +++++++++++ scripts/maint/practracker/exceptions.txt | 4 ++-- src/app/config/config.c | 3 ++- src/feature/client/entrynodes.c | 3 +++ 4 files changed, 18 insertions(+), 3 deletions(-)