[tor-commits] [tor/master] Merge branch 'fix-policies-memory-v2-squashed'

[nickm at torproject.org]

commit 85a48d5e471c62003d58e615bac8e1bd8c09631a
Merge: eedef41 8ce70fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 27 11:54:52 2015 -0500

    Merge branch 'fix-policies-memory-v2-squashed'

 src/or/policies.c      |   71 ++++++++++++++++++++++++++++--------------------
 src/test/test_policy.c |    2 +-
 2 files changed, 42 insertions(+), 31 deletions(-)