commit 2e93bffa1dbd4e38038a040b1159ade093cdf41c Merge: f8885b7 0f0d435 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 1 09:01:44 2017 -0500

Merge remote-tracking branch 'public/bug21129'

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