[tor-commits] [tor/master] Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2

[nickm at torproject.org]

commit 3300a6e93aa9e6adfe9c6bb7949b3774e98b94f8
Merge: cf1e6ad2d 8dff23eb3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 11:20:20 2017 -0500

    Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2

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