[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug6769'

[nickm at torproject.org]

commit 87e4b9259ad76ac12613bf569f45a2110ed0e400
Merge: e12560d f0fb55a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 19 17:04:44 2016 -0400

    Merge remote-tracking branch 'arma/bug6769'

 changes/bug20269    |  4 ++++
 changes/bug6769     |  5 +++++
 src/or/entrynodes.c | 21 ---------------------
 src/or/entrynodes.h |  1 -
 src/or/microdesc.c  | 17 +++--------------
 5 files changed, 12 insertions(+), 36 deletions(-)