commit c58592e658d6e9d7a99ec61b3746a80e4e6debe0
Merge: 31f41fe 89ec191
Author: Nick Mathewson <[email protected]>
Date: Tue Nov 8 18:51:19 2016 -0500
Merge branch 'maint-0.2.9'
changes/bug20306_029 | 4 ++++
src/or/policies.c | 37 +++++++++++++++++--------------------
src/or/policies.h | 3 ++-
src/or/router.c | 4 ++--
src/or/routerparse.c | 2 +-
src/test/test_policy.c | 18 ++++++++++--------
6 files changed, 36 insertions(+), 32 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
