commit 988b0afbd6bbb97e3ca796a608a4087888f162aa Merge: 4ec9751 e044b4f Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 16 11:29:02 2016 -0500

Merge branch 'ticket20826_v2'

src/or/entrynodes.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)