commit 47f587c4ca801c7e8aa469c9d4110c8c1f638de5 Merge: 567a56a 4f60254 Author: Nick Mathewson nickm@torproject.org Date: Sun Mar 26 12:28:58 2017 +0200

Merge branch 'ticket21799' into maint-0.3.0

changes/bug21799 | 6 ++++++ src/test/test_entrynodes.c | 3 +++ 2 files changed, 9 insertions(+)