[tor-commits] [tor/maint-0.3.1] Merge branch 'ticket25183_029_01' into ticket24902_029_05

[nickm@xxxxxxxxxxxxxx]

commit 112638921b479f09bb473952c1870b27a0867971
Merge: 22a5d3dd2 a445327b8
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Thu Feb 8 16:56:21 2018 -0500

    Merge branch 'ticket25183_029_01' into ticket24902_029_05

 src/common/address.c        |  22 ++++++
 src/common/address.h        |   2 +
 src/common/address_set.c    | 129 ++++++++++++++++++++++++++++++++
 src/common/address_set.h    |  35 +++++++++
 src/common/include.am       |   2 +
 src/or/nodelist.c           |  78 ++++++++++++++++++++
 src/or/nodelist.h           |   3 +
 src/test/include.am         |   1 +
 src/test/test.c             |   1 +
 src/test/test.h             |   1 +
 src/test/test_address_set.c | 174 ++++++++++++++++++++++++++++++++++++++++++++
 11 files changed, 448 insertions(+)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits