commit cf3f7753c3f85cdb77b5602fbc29970177defa01 Merge: 9c2b114b2 e82023d2f Author: Nick Mathewson nickm@torproject.org Date: Sat Dec 1 11:15:09 2018 -0500

Merge branch 'maint-0.3.5'

changes/bug28554 | 3 +++ src/test/test_entrynodes.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)