commit a71552268dc5918d5c1b23eca45eb07330a68f54 Merge: 5ea9a48ae 3300a6e93 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 11:20:23 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/ticket23637 | 5 +++++ src/or/policies.c | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)