[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 0bfd1c318cdd468d2699714a36687e9cda16fabb Merge: af39c13a0 6199e27a2 Author: Nick MathewsonDate: Tue Aug 1 11:19:28 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit af39c13a0385c9c61b3a7ffdd6362d2f86e3f44b Merge: 09618bc48 ebb441ded Author: Nick MathewsonDate: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 .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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 09618bc48884255d6d3dbc8b156fe025817d9402 Merge: 78dfa76dd 6d0af8dac Author: Nick MathewsonDate: Wed Jul 26 15:34:40 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 .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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 78dfa76ddcfd72015b0454e397de9a190e4e3106 Merge: ff8c230 b47249e Author: Nick MathewsonDate: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit ff8c230d7cadb6c24dcf9c121521cff976fc83a5 Merge: ccae991 0ee15c9 Author: Nick MathewsonDate: Wed Jul 5 13:42:26 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22789 | 6 ++ src/common/compat.c | 8 ++-- src/test/test_addr.c | 9 + 3 files changed, 21 insertions(+), 2 deletions(-) diff --cc src/test/test_addr.c index 50011e6,645fc64..2c126e6 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -346,9 -340,15 +346,18 @@@ test_addr_ip6_helpers(void test_pton6_bad("a:::b:c"); test_pton6_bad(":::a:b:c"); test_pton6_bad("a:b:c:::"); + test_pton6_bad("1.2.3.4"); + test_pton6_bad(":1.2.3.4"); + test_pton6_bad(".2.3.4"); + /* Regression tests for 22789. */ + test_pton6_bad("0xfoo"); + test_pton6_bad("0x88"); + test_pton6_bad("0xyxxy"); + test_pton6_bad("0XFOO"); + test_pton6_bad("0X88"); + test_pton6_bad("0XYXXY"); + test_pton6_bad("0x"); + test_pton6_bad("0X"); /* test internal checking */ test_external_ip("fbff:::2:7", 0); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick MathewsonDate: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 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
[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 325c507a090589ada4f0a781a313214c7cfd33a0 Merge: 1a7af74 104e8fa Author: Nick MathewsonDate: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-june2017 |4 + src/config/geoip | 5079 +--- src/config/geoip6 | 1952 +-- 3 files changed, 4449 insertions(+), 2586 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 1a7af7470fdd6173f1b876fc6fee2b171174b4ff Merge: f3804f5 ec3ce77 Author: Nick MathewsonDate: Thu Jun 8 14:05:37 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 77c5d8c73856da7f07508fc263685717bd88dbc7 Merge: fa73f59 8e439a6 Author: Nick MathewsonDate: Thu Jun 8 09:28:11 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit dec7998f5c42dde955760efc72f57025a32da238 Merge: 2e5220c 56a7c5b Author: Nick MathewsonDate: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/trove-2017-005 | 7 +++ src/or/relay.c | 3 ++- 2 files changed, 9 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 2e5220cb8b34b614fa10102899841247e906fb7b Merge: 1a540b5 4ee48cb Author: Nick MathewsonDate: Mon Jun 5 14:38:54 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/geoip.c | 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 1a540b579248c04eba79c3e18d022054b238f6f5 Merge: 68d6720 e3ebae4 Author: Nick MathewsonDate: Mon Jun 5 12:00:08 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22490 | 3 +++ src/or/geoip.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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 68d6720452fda2ffbc1a484672aa6d09c99f1d41 Merge: a8a860e 5207e41 Author: Nick MathewsonDate: Mon May 8 08:06:59 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-may2017 |4 + src/config/geoip | 5862 +++-- src/config/geoip6 | 689 +- 3 files changed, 4358 insertions(+), 2197 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit a8a860e1dac94e2194b4d073ee3245978121bbe8 Merge: 933a1e7 9d79332 Author: Nick MathewsonDate: Thu Apr 6 08:31:12 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-april2017 | 4 + src/config/geoip| 14366 +- src/config/geoip6 | 677 ++- 3 files changed, 9792 insertions(+), 5255 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 933a1e79975226c357d9d7f32be479a4868bb8d7 Merge: 884b371 4488c31 Author: Nick MathewsonDate: Wed Mar 8 10:10:29 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-march2017 | 4 + src/config/geoip| 13115 +++--- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit b2b604ecb4df95526a309c9ff507dff942472daa Merge: aeb299b 4bab288 Author: Nick MathewsonDate: Tue Feb 28 10:22:36 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid bumping version ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit a452b713955422e217f7056cf50cb3591830dee9 Merge: 124062e 194e310 Author: Nick MathewsonDate: Wed Feb 15 07:47:04 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug20384 | 10 ++ changes/trove-2017-001.2 | 8 src/or/routerparse.c | 49 +--- 3 files changed, 48 insertions(+), 19 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 144ec3d58cd7358e6563023737a5f91844db93b0 Merge: 124062e 635c5a8 Author: Roger DingledineDate: Mon Feb 13 15:23:50 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug20384 | 10 ++ 1 file changed, 10 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 124062e84339ac16ca007a1dc3227951eadcf35b Merge: 2ce4330 f601605 Author: Nick MathewsonDate: Mon Feb 13 14:37:01 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-february2017 | 4 + src/config/geoip | 10832 --- src/config/geoip6 | 1651 ++- 3 files changed, 7351 insertions(+), 5136 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick MathewsonDate: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --cc src/or/main.c index 031f758,9e78ea0..31fbdcd --- a/src/or/main.c +++ b/src/or/main.c @@@ -524,9 -506,48 +524,48 @@@ connection_is_reading(connection_t *con (conn->read_event && event_pending(conn->read_event, EV_READ, NULL)); } + /** Check whether conn is correct in having (or not having) a + * read/write event (passed in evtype == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + /* DNS requests which we launch through the dnsserv.c module do not have + * any underlying socket or any underlying linked connection, so they + * shouldn't have any attached events either. + */ + bad = ev != NULL; + } else { + /* Everytyhing else should have an underlying socket, or a linked + * connection (which is also tracked with a read_event/write_event pair). + */ + bad = ev == NULL; + } + + if (bad) { + log_warn(LD_BUG, "Event missing on connection %p [%s;%s]. " + "socket=%d. linked=%d. " + "is_dns_request=%d. Marked_for_close=%s:%d", + conn, + conn_type_to_string(conn->type), + conn_state_to_string(conn->type, conn->state), + (int)conn->s, (int)conn->linked, + (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request), + conn->marked_for_close_file ? conn->marked_for_close_file : "-", + conn->marked_for_close + ); + //log_backtrace(LOG_WARN, LD_BUG, "Backtrace attached."); + return -1; + } + return 0; + } + /** Tell the main loop to stop notifying conn of any read events. */ -void -connection_stop_reading(connection_t *conn) +MOCK_IMPL(void, +connection_stop_reading,(connection_t *conn)) { tor_assert(conn); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit b9ef21cf565cab46571f965fc2d3f368c7e7a1da Merge: 6b37512 e4a4224 Author: Nick MathewsonDate: Tue Feb 7 09:17:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --cc src/or/config.c index 3c7e6e4,eae7296..c60dd11 --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,21 -794,21 +856,21 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge 82.94.251.203:80 " - "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", -"Bifroest orport=443 bridge no-v2 " ++"Bifroest orport=443 bridge " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", -"gabelmoo orport=443 no-v2 " +"gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", -"dannenberg orport=443 no-v2 " +"dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", -"maatuska orport=80 no-v2 " +"maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", -"Faravahar orport=443 no-v2 " +"Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", -"longclaw orport=443 no-v2 " +"longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 6b37512dc76152926a16d93f2be52083cd5ae436 Merge: 05ec055 d6eae78 Author: Nick MathewsonDate: Tue Feb 7 08:54:47 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/rsa_init_bug | 7 +++ src/common/crypto.c | 4 +++- 2 files changed, 10 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 640b4022324c19cf330a26b8d42b6bf7707346ce Merge: 34fdd51 053e11f Author: Nick MathewsonDate: Tue Feb 7 08:32:10 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick MathewsonDate: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089| 6 ++ src/common/crypto.c | 10 ++ 2 files changed, 16 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 05ec055c417c80bf7b13914fade70a72f11accc5 Merge: 332543b 51675f9 Author: Nick MathewsonDate: Tue Feb 7 08:38:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 34fdd510efc2ee66113457d3f1339f7c8ebf70c0 Merge: 39ef343 3833f67 Author: Nick MathewsonDate: Wed Jan 11 09:11:58 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-january2017 |4 + src/config/geoip | 3160 + src/config/geoip6 | 561 +++- 3 files changed, 2552 insertions(+), 1173 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 7d3d56e59a3df16615881007a77b77e30fecb831 Merge: db58d4d 8f857c2 Author: Nick MathewsonDate: Tue Dec 20 18:19:41 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 (ours merge -- there is a separate 0.2.5 patch for 20384.) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit db58d4d16ff156b8827198b2732646c73eb59f14 Merge: 3d2d3f2 0fb3058 Author: Nick MathewsonDate: Tue Dec 20 18:11:08 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug21018 | 11 +++ src/or/rendcommon.c | 6 -- src/or/routerparse.c | 6 +++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --cc src/or/rendcommon.c index bd701b2,296df55..9637d4d --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@@ -1113,8 -1327,11 +1113,10 @@@ rend_cache_store_v2_desc_as_client(cons intro_size); if (n_intro_points <= 0) { log_warn(LD_REND, "Failed to parse introduction points. Either the " -"service has published a corrupt descriptor or you have " -"provided invalid authorization data."); +"service has published a corrupt descriptor, or you have " +"provided invalid authorization data, or (maybe!) the " +"server is deliberately serving broken data in an attempt " +"to crash you with bug 21018."); - retval = -2; goto err; } else if (n_intro_points > MAX_INTRO_POINTS) { log_warn(LD_REND, "Found too many introduction points on a hidden " ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 3d2d3f2b62a361552f893b85e5b0d356be0a9261 Merge: db2571b 9db47e7 Author: Nick MathewsonDate: Fri Dec 9 08:33:57 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-december2016 |4 + src/config/geoip | 6259 ++-- src/config/geoip6 | 1193 - 3 files changed, 4705 insertions(+), 2751 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit db2571be619530389c7ca3066cfc86b32cfc7578 Merge: 304d8f3 ea59783 Author: Nick MathewsonDate: Mon Nov 7 09:29:54 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-november2016 |4 + src/config/geoip | 4025 src/config/geoip6 | 2490 ++- 3 files changed, 3407 insertions(+), 3112 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 304d8f3bbbf063c2ee504568dde134296a2025ca Merge: e4d82da 1b4984f Author: Nick MathewsonDate: Thu Oct 6 09:58:54 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-october2016 | 4 + src/config/geoip | 63919 +--- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit e4d82da05b11a78da4858050b6d1e8d922842ca3 Merge: 46754d6 56f95ba Author: Nick MathewsonDate: Wed Sep 7 13:53:43 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-september2016 | 4 + src/config/geoip| 30846 +- src/config/geoip6 | 2373 ++-- 3 files changed, 10566 insertions(+), 22657 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 46754d608110fce07fb286365b67209b35397194 Merge: d95c280 1410947 Author: Nick MathewsonDate: Fri Aug 12 10:26:48 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-august2016 | 4 + src/config/geoip | 14009 + src/config/geoip6| 1108 +++- 3 files changed, 8582 insertions(+), 6539 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit d95c2809b39fc45b7c30b0f29284bae7384c7224 Merge: 19078b1 79939c6 Author: Nick MathewsonDate: Tue Jul 19 12:31:20 2016 +0200 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2016 |4 + src/config/geoip | 4615 +--- src/config/geoip6 | 982 --- 3 files changed, 3879 insertions(+), 1722 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 19078b1b89ff7db5ceb917d34b2d152f73027334 Merge: 9d3de77 6b8c3d2 Author: Nick MathewsonDate: Tue Jul 5 13:51:34 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/19271 | 2 ++ 1 file changed, 2 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 9d3de77d4d76bbec8dfe8c53b0586171ab4b8ec1 Merge: f25f7b7 7ae34e7 Author: Nick MathewsonDate: Tue Jul 5 12:20:42 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/config.c | 2 -- 1 file changed, 2 deletions(-) diff --cc src/or/config.c index 60d3d7f,709c5cc..3c7e6e4 --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,21 +856,21 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", -"Tonga orport=443 bridge no-v2 82.94.251.203:80 " +"Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", -"gabelmoo orport=443 no-v2 " +"gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", -"dannenberg orport=443 no-v2 " +"dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", -"maatuska orport=80 no-v2 " +"maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", -"Faravahar orport=443 no-v2 " +"Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", -"longclaw orport=443 no-v2 " +"longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit f25f7b759c0c3aa2ba333fcf2dd2ad89c5187eef Merge: 3681463 c14c662 Author: Nick MathewsonDate: Mon Jun 13 10:48:35 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-jun2016 |4 + src/config/geoip | 3349 +++-- src/config/geoip6 | 1366 3 files changed, 3527 insertions(+), 1192 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 368146370b699781334a8f380d764b3246881f52 Merge: 34a51d1 3c2d461 Author: Nick MathewsonDate: Mon May 9 14:55:22 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-may2016 |4 + src/config/geoip | 6991 - src/config/geoip6 | 904 +-- 3 files changed, 4631 insertions(+), 3268 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 34a51d162153f12d34f2445c6efa72dc4f6ddcd8 Merge: 21f9829 97c6e71 Author: Nick MathewsonDate: Thu Apr 7 10:45:32 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-april2016 |4 + src/config/geoip| 3255 +++ src/config/geoip6 | 2549 + 3 files changed, 4455 insertions(+), 1353 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 21f9829e793fd9074c568bee548e345536df Merge: ce289e2 8e2640b Author: Nick MathewsonDate: Wed Mar 9 10:36:20 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-march2016 |4 + src/config/geoip| 8496 +++ src/config/geoip6 | 2270 ++--- 3 files changed, 6524 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit ce289e2cb5099a4abe4468049dc0d262b65bfa17 Merge: f06d9a9 ad95d64 Author: Nick MathewsonDate: Thu Feb 11 12:55:40 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18162 | 7 +++ src/common/container.c | 29 +++-- 2 files changed, 26 insertions(+), 10 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit f06d9a9cef036fc4da995f3ffda8e7a7770d0b74 Merge: 9ca3295 d5ac79e Author: Nick MathewsonDate: Fri Feb 5 08:13:13 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-february2016 |4 + src/config/geoip | 2144 +--- src/config/geoip6 | 864 ++ 3 files changed, 2328 insertions(+), 684 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit c3d11b119dbd46fa02a1e26d76ddc74424dd4b18 Merge: 4328525 35deb4d Author: Nick MathewsonDate: Tue Dec 8 10:20:14 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17772|7 +++ src/or/routerlist.c | 10 -- 2 files changed, 15 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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit 432852577000ab5eb07ae3ca961a36e5f6e796ba Merge: e8e89fd b0867fe Author: Nick MathewsonDate: Tue Dec 8 09:38:48 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17781 |3 +++ src/or/connection_edge.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.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
commit e8e89fd7a180ec54a8bdc4de09b69a4dc8f38f7d Merge: 3569cff dbb919c Author: Nick MathewsonDate: Mon Dec 7 10:10:21 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-december2015 |4 + src/config/geoip | 4547 src/config/geoip6 | 2580 + 3 files changed, 5512 insertions(+), 1619 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits