[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 6862eada65a6f41304b32c3d4fca3da9c240d5bd Merge: f794b40ec 0bfd1c318 Author: Nick MathewsonDate: Tue Aug 1 11:19:29 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit f794b40ec0056ae8642d995b3cbce04441ebe26e Merge: 0ad5a6b03 af39c13a0 Author: Nick MathewsonDate: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 0ad5a6b034df39df8cc390ee32042d4cb0683b93 Merge: 715185477 09618bc48 Author: Nick MathewsonDate: Wed Jul 26 15:34:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 .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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 715185477d135d87f8ebf6fb12804cb2db5856bb Merge: f6420bc 78dfa76 Author: Nick MathewsonDate: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit f6420bceec9707324fe23c98a2a70dd2612f183f Merge: 3de2761 ff8c230 Author: Nick MathewsonDate: Wed Jul 5 13:42:32 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick MathewsonDate: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 3913f959e3688cfa91f9fab5368ba149e00cfec6 Merge: eb92d11 325c507 Author: Nick MathewsonDate: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit eb92d11f53dd2245f4cfd618bde3996e76b498cf Merge: 95a88f7 1a7af74 Author: Nick MathewsonDate: Thu Jun 8 14:05:59 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 "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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit b796ad0300d1b023bc38e5a1498b47bc2e680eae Merge: 0de4620 77c5d8c Author: Nick MathewsonDate: Thu Jun 8 09:28:29 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 "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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 40bccc20042fcc4f43964b358257470830169e73 Merge: a56cfda dec7998 Author: Nick MathewsonDate: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit a56cfdaba20683562e5793d6bded58a591afb04c Merge: 9ea3d08 2e5220c Author: Nick MathewsonDate: Mon Jun 5 14:39:06 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 Ours merge to avoid taking 4ee48cb434c46d9e4c477dabd8a97f03e3db221d ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 9ea3d0877a5be2762cfcb4d7c2015e5ec43a2055 Merge: 159ddf6 1a540b5 Author: Nick MathewsonDate: Mon Jun 5 12:00:27 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 159ddf6ddedcad2bfc277a36fbde4aeb573be4cf Merge: 21d7767 68d6720 Author: Nick MathewsonDate: Mon May 8 08:07:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 21d776738c2abf6ee0527439f7b96d35942c129c Merge: ecc73c3 a8a860e Author: Nick MathewsonDate: Thu Apr 6 08:31:18 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit ecc73c3c035abe1a2c33e924e37e55064e712d56 Merge: 57e778f 933a1e7 Author: Nick MathewsonDate: Wed Mar 8 10:10:44 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac Merge: f7ed4a7 884b371 Author: Nick MathewsonDate: Tue Feb 28 10:25:51 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bumps ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit f7ed4a7d8f489aeb31246e4b75c30b40bbf94fa6 Merge: 6e7ff9e aeb299b Author: Nick MathewsonDate: Wed Feb 15 07:52:33 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 3781f24b8014213c200f74973deb550382957a01 Merge: 43c18b1 a452b71 Author: Nick MathewsonDate: Wed Feb 15 07:47:12 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit e778a411b9e75ad2c1b46a6624d586a6f4a0c554 Merge: 43c18b1 144ec3d Author: Roger DingledineDate: Mon Feb 13 15:27:57 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 43c18b1b7a1a10d36e16393b9f35b519f1c40fa9 Merge: f2a3041 124062e Author: Nick MathewsonDate: Mon Feb 13 14:37:42 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick MathewsonDate: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +++ 4 files changed, 66 insertions(+), 7 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit c6f2ae514eb2713d386bedac2f7e71ed04385026 Merge: e6965f7 b9ef21c Author: Nick MathewsonDate: Tue Feb 7 09:18:54 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --cc src/or/config.c index 89b6087,c60dd11..233940e --- a/src/or/config.c +++ b/src/or/config.c @@@ -853,14 -852,12 +853,14 @@@ add_default_trusted_dir_authorities(dir "moria1 orport=9101 " "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", -"tor26 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " +"tor26 orport=443 " + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", -"dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " +"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 " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit e6965f78b80e2b83367df05e204c97f5c0929a3c Merge: 8936c50 6b37512 Author: Nick MathewsonDate: Tue Feb 7 08:54:54 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749 Merge: da0d5ad 05ec055 Author: Nick MathewsonDate: Tue Feb 7 08:39:07 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit da0d5ad9830b22983864660ca1c732627e119747 Merge: 54771bc 332543b Author: Nick MathewsonDate: Tue Feb 7 08:34:37 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 54771bcaba592530d5759832beb868afba1b9595 Merge: b6227ed 34fdd51 Author: Nick MathewsonDate: Wed Jan 11 09:12:21 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 746c51b6132d84fc7899e6b95b4a1666717d8cce Merge: b18bde2 39ef343 Author: Nick MathewsonDate: Tue Dec 20 18:22:27 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 ("ours" merge because there is a separate 20384 patch for 026) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit b18bde23cf9c0afc95a83c3bfc7205218add4ddd Merge: 3d9f8ff db58d4d Author: Nick MathewsonDate: Tue Dec 20 18:11:25 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug21018 | 11 +++ src/or/rendcommon.c | 6 -- src/or/routerparse.c | 6 +++--- 3 files changed, 18 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 3d9f8ff6a5c37e9f124f8111f904b97f095ca621 Merge: 6c2174d 3d2d3f2 Author: Nick MathewsonDate: Fri Dec 9 08:34:06 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 6c2174d44d01b4c231befe9de5ce2ffb042cc65d Merge: 12a7298 db2571b Author: Nick MathewsonDate: Mon Nov 7 09:30:16 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 12a72983766d5265b5259038af711cb172671af7 Merge: 52a99cb 304d8f3 Author: Nick MathewsonDate: Thu Oct 6 09:59:03 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 52a99cb6c1e7cbcc33ed9dfd09fdcb7680f7d29b Merge: 742ff2c e4d82da Author: Nick MathewsonDate: Wed Sep 7 13:53:53 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 742ff2cddbb9676262e1b588206c3ae264f269b8 Merge: 210928f 46754d6 Author: Nick MathewsonDate: Fri Aug 12 10:27:01 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 210928f66a5acda19d3a0a00d44f1f9523fecfe3 Merge: 92891de d95c280 Author: Nick MathewsonDate: Tue Jul 19 12:31:54 2016 +0200 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 92891ded3016dd7cabb34b401ff964e325bd7d1d Merge: c28ba99 19078b1 Author: Nick MathewsonDate: Tue Jul 5 13:51:51 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit c28ba994ec95f4f669ad5131f36b0f9f1cc53782 Merge: b4bb886 9d3de77 Author: Nick MathewsonDate: Tue Jul 5 12:21:25 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 src/or/config.c | 3 --- 1 file changed, 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit b4bb88606e52c21c3b831a957516057004152bf4 Merge: 0b477bf f25f7b7 Author: Nick MathewsonDate: Mon Jun 13 10:48:48 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 0b477bfd55b16d04ddd97cec09ec978e2a57ba3b Merge: 2ce99b9 3681463 Author: Nick MathewsonDate: Mon May 9 14:55:45 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 2ce99b9f48477a9a93fd6987d8a4e19a20b9733a Merge: 443dddb 34a51d1 Author: Nick MathewsonDate: Thu Apr 7 10:45:38 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 443dddb74966eea0b30231b9f18b80b9372f2210 Merge: 740421a 21f9829 Author: Nick MathewsonDate: Wed Mar 9 10:36:35 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 740421af194b890c24242a834ed03ffc5c4c16ab Merge: 44ad3be ce289e2 Author: Nick MathewsonDate: Thu Feb 11 12:57:28 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug18162 | 7 +++ src/common/container.c | 37 - 2 files changed, 27 insertions(+), 17 deletions(-) diff --cc src/common/container.c index 864fd8a,c668068..76c129d --- a/src/common/container.c +++ b/src/common/container.c @@@ -66,28 -71,22 +71,25 @@@ smartlist_ensure_capacity(smartlist_t * #define MAX_CAPACITY (INT_MAX) #else #define MAX_CAPACITY (int)((SIZE_MAX / (sizeof(void* - #define ASSERT_CAPACITY #endif - if (size > sl->capacity) { - int higher = sl->capacity; ++ + tor_assert(size <= MAX_CAPACITY); + + if (size > (size_t) sl->capacity) { + size_t higher = (size_t) sl->capacity; if (PREDICT_UNLIKELY(size > MAX_CAPACITY/2)) { - #ifdef ASSERT_CAPACITY - /* We don't include this assertion when MAX_CAPACITY == INT_MAX, -* since int size; (size <= INT_MAX) makes analysis tools think we're -* doing something stupid. */ -- tor_assert(size <= MAX_CAPACITY); - #endif higher = MAX_CAPACITY; } else { while (size > higher) higher *= 2; } - sl->capacity = higher; + tor_assert(higher <= INT_MAX); /* Redundant */ + sl->capacity = (int) higher; -sl->list = tor_realloc(sl->list, sizeof(void*)*((size_t)sl->capacity)); +sl->list = tor_reallocarray(sl->list, sizeof(void *), +((size_t)sl->capacity)); } +#undef ASSERT_CAPACITY +#undef MAX_CAPACITY } /** Append element to the end of the list. */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 44ad3be221fb8e5e648c6d56054fb1d8596a645b Merge: e2efa9e f06d9a9 Author: Nick MathewsonDate: Fri Feb 5 08:13:24 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 400df18688e3b657852a9007151aaf26febe29a6 Merge: 1adc2bf ae22313 Author: Nick MathewsonDate: Thu Jan 7 09:14:05 2016 -0800 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-january2016 |4 + src/config/geoip | 1734 +++-- src/config/geoip6 | 881 +-- 3 files changed, 2016 insertions(+), 603 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit b53ff8606714c2f94d251a40c1a073bca760495e Merge: 089ee13 4328525 Author: Nick MathewsonDate: Tue Dec 8 09:43:25 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17781 |3 +++ 1 file changed, 3 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 1adc2bf66fedb1768c5013dcf5f4778fae453217 Merge: b53ff86 c3d11b1 Author: Nick MathewsonDate: Tue Dec 8 10:20:21 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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/master] Merge branch 'maint-0.2.5' into maint-0.2.6
commit 089ee13534b8e1acf053154562debbcdcfc92d07 Merge: 2ec5e24 e8e89fd Author: Nick MathewsonDate: Mon Dec 7 10:10:44 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 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