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