Merge branch 'tor-github/pr/1319'
commit286b129b09964bbff2bd8f5de7f4edac5f2b4827
authorDavid Goulet <dgoulet@torproject.org>
Thu, 12 Sep 2019 17:53:59 +0000 (12 13:53 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 12 Sep 2019 17:53:59 +0000 (12 13:53 -0400)
tree5000eda3927ad0721bed26e61f3bb92d5bb70603
parentc39c9ce26ba2990177e45a4c7bffaed51d88d280
parentc7cbe64463cba30586e53e8e5dba9596aba3c67d
Merge branch 'tor-github/pr/1319'
src/feature/client/entrynodes.c
src/test/test_entrynodes.c