commit 0895808023b023a8eff00c6b6eb27c4ec4b40191 Merge: 801530f a5130de Author: Nick Mathewson nickm@torproject.org Date: Sun Mar 26 12:30:45 2017 +0200

Merge remote-tracking branch 'origin/maint-0.3.0'

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