[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm at torproject.org]

commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7
Merge: 08469a338 8a7767603
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 2 10:10:28 2018 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

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