commit 16f337e7639c42b5c6106d6bc9828cb9e6614054 Merge: eef8bd4 1582ada Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 28 08:16:43 2017 -0500

Merge branch 'bug21027_v2_squashed' into maint-0.3.0

changes/bug21027 | 8 ++++++++ src/or/bridges.c | 27 +++++++++++++++++++++++++++ src/or/bridges.h | 4 ++++ src/or/entrynodes.c | 37 ++++++++++++++++--------------------- 4 files changed, 55 insertions(+), 21 deletions(-)