commit 94e8f60901eee5d0f0da512703e4de7fb7e0b449
Merge: 3e45b12 8a7e5c3
Author: Nick Mathewson <[email protected]>
Date: Fri Jan 13 16:49:48 2017 -0500
Merge branch 'ipv6-only-client_squashed'
changes/bug20996 | 9 +++++++
src/or/config.c | 17 -------------
src/or/nodelist.c | 21 ++++++++++++----
src/or/policies.c | 65 ++++++++++++++++++++++++++++++++++++++++---------
src/or/routerlist.c | 2 +-
src/test/test_options.c | 10 --------
6 files changed, 80 insertions(+), 44 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
