commit b2e9a107b7a69f29f88d9c5f67fea3cee3082cf0 Merge: 90894c8 52498b8 Author: Nick Mathewson nickm@torproject.org Date: Mon May 22 09:09:16 2017 -0400

Merge remote-tracking branch 'asn/bug21969_bridges'

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