commit 649000662d3b5f7000c9a4b06444f154e3b0628d Merge: 350fecfaf 8dff23eb3 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 24 12:52:41 2017 -0400

Merge remote-tracking branch 'arma/ticket23637'

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