[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug21128'

[nickm at torproject.org]

commit f8885b76ef353c4bccc90119448df5301b3ba8cb
Merge: a5aec6a 35d8270
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 1 09:01:28 2017 -0500

    Merge remote-tracking branch 'public/bug21128'

 changes/bug21128    | 5 +++++
 src/or/entrynodes.c | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)