[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0

[nickm at torproject.org]

commit e84127d99e3f3ac95239cc857d401289ef5cb768
Merge: a242d19 6009c89
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 28 13:48:52 2017 -0400

    Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0

 changes/bug21969    |  3 +++
 src/or/bridges.c    |  6 +++++-
 src/or/directory.c  |  6 ++++--
 src/or/directory.h  |  4 +++-
 src/or/entrynodes.c | 28 ++++++++++++++++++++++++++++
 src/or/entrynodes.h |  4 ++++
 src/or/router.c     |  3 ++-
 src/or/routerlist.c |  2 +-
 8 files changed, 50 insertions(+), 6 deletions(-)