commit e7126a1030233fd656cff4a8ee998026065fb65b Merge: b95ef19a7 9b60acd4d Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 24 19:41:26 2017 -0400

Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2

changes/bug20532 | 4 ++++ src/or/bridges.c | 8 ++++++++ 2 files changed, 12 insertions(+)