commit 72391fce2336cf028e6d0b6cb0be41b2db81ebcf Merge: 61b5d0535 6e87c0b23 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 15 08:13:45 2017 -0400

Merge remote-tracking branch 'teor/bug23524'

changes/bug23524 | 4 ++++ src/or/bridges.c | 9 ++++++--- src/or/directory.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-)