commit e88686cb2cbae39333982505f38f2d7568af4f32
Merge: 48c1c02 0ba672a
Author: Nick Mathewson <[email protected]>
Date: Tue Feb 23 07:36:56 2016 -0500
Merge remote-tracking branch 'teor/bug18348-v2'
changes/bug18348 | 5 +
src/or/connection.c | 7 +
src/or/directory.c | 2 +-
src/or/entrynodes.c | 7 +-
src/or/nodelist.c | 5 +
src/or/or.h | 4 +-
src/or/policies.c | 318 +++++++++++++++---------------
src/or/policies.h | 28 ++-
src/or/routerlist.c | 4 +-
src/test/test_policy.c | 522 ++++++++++++++++++++++++++++++++-----------------
10 files changed, 543 insertions(+), 359 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
