commit b9be385fd686dd46ff51a403a0c2ac1d23c9002a Merge: e343cb8f6 da82e0b57 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 20 14:35:26 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

src/or/entrynodes.c | 30 ++++++++++++++---------------- src/or/entrynodes.h | 2 +- 2 files changed, 15 insertions(+), 17 deletions(-)