commit fd46d8d0ad9e976cdae7676e9f27f572b78ac959 Merge: 11336cfa0 707076002 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)