[tor-commits] [tor/master] Merge branch 'ticket28853'

[nickm at torproject.org]

commit ed0bc85ed0ac765c91def249afa1390bd03cfe85
Merge: bb091da1e 3dd1f064a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 18:59:56 2018 -0500

    Merge branch 'ticket28853'

 changes/ticket28853    |  3 ++
 src/core/or/policies.c | 80 ++++++++++++++++++++++++++------------------------
 2 files changed, 45 insertions(+), 38 deletions(-)