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

[nickm at torproject.org]

commit bc5ef83f8f960e9ccf0e8634301037e61d43f332
Merge: d53f77985 707076002
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 2 10:10:28 2018 -0500

    Merge branch 'maint-0.3.2'

 changes/bug24736  | 6 ++++++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)