[tor-commits] [tor/master] Merge branch 'refactor-effective-entry'

[nickm at torproject.org]

commit b3eba8ef12c714e1b97b9026da96d27433064a1e
Merge: caff665 580d788
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 9 11:05:41 2015 -0500

    Merge branch 'refactor-effective-entry'

 changes/feature17608 |    4 ++
 src/or/policies.c    |  122 +++++++++++++++++++++++++++-----------------------
 src/or/policies.h    |    2 +-
 3 files changed, 71 insertions(+), 57 deletions(-)