commit e1718c2dc09666f4db65b64964ef14580e45a5a8 Merge: 698984c a5130de Author: Nick Mathewson nickm@torproject.org Date: Sun Mar 26 12:30:09 2017 +0200

Merge branch 'maint-0.3.0' into release-0.3.0

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