[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit e5c341eb7c1189985d903f708ce91516da7f0c76
Merge: 349818380 e7126a103
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 24 19:43:13 2017 -0400

    Merge branch 'maint-0.3.2'

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