commit 26997ef9ae4591c06f5916fdfdd216d01333e878 Merge: 23d365f 18a9820 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 1 08:51:10 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

changes/bug21415 | 4 ++++ src/or/entrynodes.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)