[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34 +-- src/or/circuitmux.h| 2 +- src/or/or.h| 15 + src/or/relay.c | 82 -- src/or/relay.h | 8 + src/test/test_circuitmux.c | 12 +++ 7 files changed, 126 insertions(+), 34 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit c604a76a53204eb20af0fab0a9f1f49fba393fd9 Merge: eecfed0cd 877dd1d6c Author: Nick Mathewson Date: Wed Dec 20 12:15:23 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-2017-12-06 | 4 + src/config/geoip | 12380 +++-- src/config/geoip6| 3373 +--- 3 files changed, 10033 insertions(+), 5724 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit eecfed0cd2c8c92175106e211d1662fa43fc60bc Merge: eaaa1108a f7151387d Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 953a8f851081e6157e9296186c296ab10106b7eb Merge: 495db72c1 f97f301b5 Author: Nick Mathewson Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 495db72c1eee7f9ed890ae252eb5b61a70438065 Merge: 73869c99a dc3890439 Author: Nick Mathewson Date: Fri Dec 1 09:35:07 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 7e2b012b46a4ade2818e47be15d76255cf6f121e Merge: 52d7af631 ba4a9cf0c Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++ changes/trove-2017-011 | 8 changes/trove-2017-012-part1 | 6 ++ src/common/crypto.c | 16 +--- src/or/rendservice.c | 8 +++- src/or/routerlist.c | 5 - 7 files changed, 53 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 1fd6e25522ed064e8043f4548fbd33fca9246295 Merge: 7e2b012b4 6ee447254 Author: Nick Mathewson Date: Thu Nov 30 12:22:38 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 30b3229252709eeca054ee06cc6e366226723e24 Merge: 53c3174ee 25c90230b Author: Nick Mathewson Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bastet_v6 | 4 src/or/config.c | 1 + 2 files changed, 5 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 53c3174ee43c3f54f8180be8256180f6f0d24c0d Merge: 1b9bb2c84 d388f9d87 Author: Nick Mathewson Date: Sat Nov 18 11:01:43 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug18329-minimal | 6 ++ src/or/router.c | 9 + 2 files changed, 15 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48 Merge: ab415ae95 800797e7f Author: Nick Mathewson Date: Mon Nov 13 12:57:58 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug23291| 3 +++ src/test/test-memwipe.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 9666c620d584b2c715596b415a808941b17cbda0 Merge: 04d4786cc c9b76a12f Author: Nick Mathewson Date: Sat Nov 11 12:23:33 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-2017-11-06 |4 + src/config/geoip | 9406 -- src/config/geoip6| 848 - 3 files changed, 6426 insertions(+), 3832 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 151d5ededf9fb334a5195904945f95cf626f51bc Merge: 46091a88c faf568fa7 Author: Nick Mathewson Date: Wed Oct 25 09:28:29 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77 Merge: 1db5081ba a5f5bda46 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 132e2f69b1068b139d3c114fddd6efe58d6fc8f4 Merge: fcaf3335b 6f87a8589 Author: Nick Mathewson Date: Mon Oct 23 08:53:25 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug23690 | 5 + src/or/circuitlist.c | 1 + 2 files changed, 6 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 43ebe54a24d3210ef037f7e2b67fad9597361bab Merge: 2984d9916 91c17ffbd Author: Nick Mathewson Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 2984d991653b70fcd561d7d0bd693c46220cec74 Merge: 2c93be80d d6bdec159 Author: Nick Mathewson Date: Thu Oct 5 11:03:35 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-october2017 |4 + src/config/geoip | 8683 +++-- src/config/geoip6 | 653 ++-- 3 files changed, 5654 insertions(+), 3686 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 2c93be80d9ad0712b5716c85e32f7a5184f3b1d2 Merge: 42e12a353 8e52c4658 Author: Nick Mathewson Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw-ipv6 | 6 ++ src/or/config.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 42e12a3537fef04ab77defd6cb5581add439de43 Merge: a57f1ff7a 0a72d1c8f Author: Nick Mathewson Date: Mon Sep 18 14:40:22 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 314652dc16ece380de343ccdc5a2155d612bcff7 Merge: f7b06202c 0ec72b030 Author: Nick Mathewson Date: Mon Sep 18 09:39:46 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/trove-2017-008 | 5 + src/or/rendservice.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit f7b06202c787d117eb22f04798a6f3f4b6722af1 Merge: 3c6d4fe04 26f68dfce Author: Nick Mathewson Date: Thu Sep 14 13:21:28 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb Merge: 969602159 bcf2b413c Author: Nick Mathewson Date: Thu Sep 7 15:18:00 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-september2017 | 4 + src/config/geoip| 10802 -- src/config/geoip6 | 941 +++- 3 files changed, 6828 insertions(+), 4919 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796 - src/config/geoip6| 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 925ef048a977ccee0edb44ba68db2397b36d8c92 Merge: 24ddf5862 0e7558ab6 Author: Nick Mathewson Date: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-july2017 | 4 + src/config/geoip | 10075 --- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit dcc477cb53cda792c433b01c21f45cd4415c984d Merge: 0117e2ea0 fbf93614c Author: Nick Mathewson Date: Wed Jul 26 15:35:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 88 changes/bug22636 | 8 ++ 2 files changed, 96 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit ed0fb218342dcf7cc54f6abd9078dcd3efa5452c Merge: 4858cda 48e45e2 Author: Nick Mathewson Date: Fri Jul 7 10:56:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22838_028 | 5 + src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 4858cda2dfc61bb32269aea4f6978d6458fb Merge: dfc0614 c1e4aff Author: Nick Mathewson Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 32c0066e4baa2ca16902a70b941d8d3afbc279ff Merge: bb97f68 5ff0f1a Author: Nick Mathewson Date: Wed Jul 5 13:43:21 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22789 | 6 ++ src/common/compat.c | 8 ++-- src/test/test_addr.c | 9 + 3 files changed, 21 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
commit 711160a46f5fbba7106c23c29f99bed75928a5a7 Merge: 1c64133 3483f7c Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits