September 2016 - tor-commits - lists.torproject.org

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 20 Sep '16

20 Sep '16

commit f527a809b3adbb1379465f2c5c7238502c2f3877 Merge: 8a163e9 19a9872 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 20 19:29:03 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 src/or/fallback_dirs.inc | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-)

1 0

[tor/release-0.2.8] fixup! Update hard-coded fallback list based on pre-0.2.9 checks
by nickm＠torproject.org 20 Sep '16

20 Sep '16

commit 19a9872be2e91e367b85795186c29a077223e91e Author: teor <teor2345(a)gmail.com> Date: Wed Sep 21 09:13:04 2016 +1000 fixup! Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index c2329f1..c4a2b13 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -174,11 +174,9 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "46.165.230.5:80 orport=443 id=A0F06C2FADF88D3A39AA3072B406F09D7095AC9E" " weight=10", -/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 - * "171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" - * " ipv6=[2001:67c:289c:3::77]:443" - * " weight=10", - */ +"171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" +" ipv6=[2001:67c:289c:3::77]:443" +" weight=10", "176.9.5.116:9030 orport=9001 id=A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911" " weight=10", "192.34.63.137:9030 orport=443 id=ABCB4965F1FEE193602B50A365425105C889D3F8"

1 0

[tor/master] Update hard-coded fallback list based on pre-0.2.9 checks
by nickm＠torproject.org 20 Sep '16

20 Sep '16

commit c6d51b45770497227115f1a1d474cb5a8d582dd9 Author: teor <teor2345(a)gmail.com> Date: Tue Sep 20 16:49:45 2016 +1000 Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 54 +++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 245110f..c2329f1 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -30,9 +30,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163" " weight=10", -"144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB" -" ipv6=[2a01:4f8:190:9490::dead]:443" -" weight=10", +/* Fallback was on 0.2.8.6 list, but down for a week before 0.2.9 + * "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB" + * " ipv6=[2a01:4f8:190:9490::dead]:443" + * " weight=10", + */ "178.32.216.146:9030 orport=9001 id=17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2" " weight=10", "46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8" @@ -47,8 +49,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay * "51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D" * " weight=10", */ -"194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C" + * " weight=10", + */ "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510" " weight=10", "62.210.124.124:9130 orport=9101 id=2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E" @@ -84,8 +88,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay "212.51.134.123:9030 orport=9001 id=50586E25BE067FD1F739998550EDDCB1A14CA5B2" " ipv6=[2a02:168:6e00:0:3a60:77ff:fe9c:8bd1]:9001" " weight=10", -"5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33" -" weight=10", +/* Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9 + * "5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33" + * " weight=10", + */ "94.23.204.175:9030 orport=9001 id=5665A3904C89E22E971305EE8C1997BCA4123C69" " weight=10", "109.163.234.9:80 orport=443 id=5714542DCBEE1DD9864824723638FD44B2122CEA" @@ -109,8 +115,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "144.76.73.140:9030 orport=9001 id=6A640018EABF3DA9BAD9321AA37C2C87BBE1F907" " weight=10", -"94.126.23.174:9030 orport=9001 id=6FC6F08270D565BE89B7C819DD8E2D487397C073" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "94.126.23.174:9030 orport=9001 id=6FC6F08270D565BE89B7C819DD8E2D487397C073" + * " weight=10", + */ "176.31.191.26:9030 orport=9001 id=7350AB9ED7568F22745198359373C04AC783C37C" " weight=10", "46.101.237.246:9030 orport=9001 id=75F1992FD3F403E9C082A5815EB5D12934CDF46C" @@ -166,9 +174,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "46.165.230.5:80 orport=443 id=A0F06C2FADF88D3A39AA3072B406F09D7095AC9E" " weight=10", -"171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" -" ipv6=[2001:67c:289c:3::77]:443" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" + * " ipv6=[2001:67c:289c:3::77]:443" + * " weight=10", + */ "176.9.5.116:9030 orport=9001 id=A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911" " weight=10", "192.34.63.137:9030 orport=443 id=ABCB4965F1FEE193602B50A365425105C889D3F8" @@ -240,13 +250,17 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "5.34.183.205:80 orport=443 id=DDD7871C1B7FA32CB55061E08869A236E61BDDF8" " weight=10", -"195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197" + * " weight=10", + */ "46.252.26.2:45212 orport=49991 id=E589316576A399C511A9781A73DA4545640B479D" " weight=10", -"176.31.180.157:143 orport=22 id=E781F4EC69671B3F1864AE2753E0890351506329" -" ipv6=[2001:41d0:8:eb9d::1]:22" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "176.31.180.157:143 orport=22 id=E781F4EC69671B3F1864AE2753E0890351506329" + * " ipv6=[2001:41d0:8:eb9d::1]:22" + * " weight=10", + */ "131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8" " weight=10", "91.219.236.222:80 orport=443 id=EC413181CEB1C8EDC17608BBB177CD5FD8535E99" @@ -256,8 +270,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "46.101.143.173:80 orport=443 id=F960DF50F0FD4075AC9B505C1D4FFC8384C490FB" " weight=10", -"195.154.8.111:80 orport=443 id=FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64" -" weight=10", +/* Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9 + * "195.154.8.111:80 orport=443 id=FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64" + * " weight=10", + */ "192.187.124.98:9030 orport=9001 id=FD1871854BFC06D7B02F10742073069F0528B5CC" " weight=10", "193.11.164.243:9030 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07"

1 0

[tor/master] fixup! Update hard-coded fallback list based on pre-0.2.9 checks
by nickm＠torproject.org 20 Sep '16

20 Sep '16

commit 19a9872be2e91e367b85795186c29a077223e91e Author: teor <teor2345(a)gmail.com> Date: Wed Sep 21 09:13:04 2016 +1000 fixup! Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index c2329f1..c4a2b13 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -174,11 +174,9 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "46.165.230.5:80 orport=443 id=A0F06C2FADF88D3A39AA3072B406F09D7095AC9E" " weight=10", -/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 - * "171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" - * " ipv6=[2001:67c:289c:3::77]:443" - * " weight=10", - */ +"171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" +" ipv6=[2001:67c:289c:3::77]:443" +" weight=10", "176.9.5.116:9030 orport=9001 id=A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911" " weight=10", "192.34.63.137:9030 orport=443 id=ABCB4965F1FEE193602B50A365425105C889D3F8"

1 0

[tor/maint-0.2.8] Update hard-coded fallback list based on pre-0.2.9 checks
by nickm＠torproject.org 20 Sep '16

20 Sep '16

commit c6d51b45770497227115f1a1d474cb5a8d582dd9 Author: teor <teor2345(a)gmail.com> Date: Tue Sep 20 16:49:45 2016 +1000 Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 54 +++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index 245110f..c2329f1 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -30,9 +30,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "178.62.197.82:80 orport=443 id=0D3EBA17E1C78F1E9900BABDB23861D46FCAF163" " weight=10", -"144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB" -" ipv6=[2a01:4f8:190:9490::dead]:443" -" weight=10", +/* Fallback was on 0.2.8.6 list, but down for a week before 0.2.9 + * "144.76.14.145:110 orport=143 id=14419131033443AE6E21DA82B0D307F7CAE42BDB" + * " ipv6=[2a01:4f8:190:9490::dead]:443" + * " weight=10", + */ "178.32.216.146:9030 orport=9001 id=17898F9A2EBC7D69DAF87C00A1BD2FABF3C9E1D2" " weight=10", "46.101.151.222:80 orport=443 id=1DBAED235E3957DE1ABD25B4206BE71406FB61F8" @@ -47,8 +49,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay * "51.254.215.121:80 orport=443 id=262B66AD25C79588AD1FC8ED0E966395B47E5C1D" * " weight=10", */ -"194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "194.150.168.79:11112 orport=11111 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C" + * " weight=10", + */ "144.76.26.175:9012 orport=9011 id=2BA2C8E96B2590E1072AECE2BDB5C48921BF8510" " weight=10", "62.210.124.124:9130 orport=9101 id=2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E" @@ -84,8 +88,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay "212.51.134.123:9030 orport=9001 id=50586E25BE067FD1F739998550EDDCB1A14CA5B2" " ipv6=[2a02:168:6e00:0:3a60:77ff:fe9c:8bd1]:9001" " weight=10", -"5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33" -" weight=10", +/* Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9 + * "5.175.233.86:80 orport=443 id=5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33" + * " weight=10", + */ "94.23.204.175:9030 orport=9001 id=5665A3904C89E22E971305EE8C1997BCA4123C69" " weight=10", "109.163.234.9:80 orport=443 id=5714542DCBEE1DD9864824723638FD44B2122CEA" @@ -109,8 +115,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "144.76.73.140:9030 orport=9001 id=6A640018EABF3DA9BAD9321AA37C2C87BBE1F907" " weight=10", -"94.126.23.174:9030 orport=9001 id=6FC6F08270D565BE89B7C819DD8E2D487397C073" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "94.126.23.174:9030 orport=9001 id=6FC6F08270D565BE89B7C819DD8E2D487397C073" + * " weight=10", + */ "176.31.191.26:9030 orport=9001 id=7350AB9ED7568F22745198359373C04AC783C37C" " weight=10", "46.101.237.246:9030 orport=9001 id=75F1992FD3F403E9C082A5815EB5D12934CDF46C" @@ -166,9 +174,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "46.165.230.5:80 orport=443 id=A0F06C2FADF88D3A39AA3072B406F09D7095AC9E" " weight=10", -"171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" -" ipv6=[2001:67c:289c:3::77]:443" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" + * " ipv6=[2001:67c:289c:3::77]:443" + * " weight=10", + */ "176.9.5.116:9030 orport=9001 id=A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911" " weight=10", "192.34.63.137:9030 orport=443 id=ABCB4965F1FEE193602B50A365425105C889D3F8" @@ -240,13 +250,17 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "5.34.183.205:80 orport=443 id=DDD7871C1B7FA32CB55061E08869A236E61BDDF8" " weight=10", -"195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "195.191.233.221:80 orport=443 id=DE134FC8E5CC4EC8A5DE66934E70AC9D70267197" + * " weight=10", + */ "46.252.26.2:45212 orport=49991 id=E589316576A399C511A9781A73DA4545640B479D" " weight=10", -"176.31.180.157:143 orport=22 id=E781F4EC69671B3F1864AE2753E0890351506329" -" ipv6=[2001:41d0:8:eb9d::1]:22" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "176.31.180.157:143 orport=22 id=E781F4EC69671B3F1864AE2753E0890351506329" + * " ipv6=[2001:41d0:8:eb9d::1]:22" + * " weight=10", + */ "131.188.40.188:443 orport=80 id=EBE718E1A49EE229071702964F8DB1F318075FF8" " weight=10", "91.219.236.222:80 orport=443 id=EC413181CEB1C8EDC17608BBB177CD5FD8535E99" @@ -256,8 +270,10 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "46.101.143.173:80 orport=443 id=F960DF50F0FD4075AC9B505C1D4FFC8384C490FB" " weight=10", -"195.154.8.111:80 orport=443 id=FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64" -" weight=10", +/* Fallback was on 0.2.8.6 list, but changed IPv4 before 0.2.9 + * "195.154.8.111:80 orport=443 id=FCB6695F8F2DC240E974510A4B3A0F2B12AB5B64" + * " weight=10", + */ "192.187.124.98:9030 orport=9001 id=FD1871854BFC06D7B02F10742073069F0528B5CC" " weight=10", "193.11.164.243:9030 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07"

1 0

[tor/maint-0.2.8] fixup! Update hard-coded fallback list based on pre-0.2.9 checks
by nickm＠torproject.org 20 Sep '16

20 Sep '16

commit 19a9872be2e91e367b85795186c29a077223e91e Author: teor <teor2345(a)gmail.com> Date: Wed Sep 21 09:13:04 2016 +1000 fixup! Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index c2329f1..c4a2b13 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -174,11 +174,9 @@ URL: https:onionoo.torproject.orguptime?first_seen_days=7-&flag=V2Dir&type=relay " weight=10", "46.165.230.5:80 orport=443 id=A0F06C2FADF88D3A39AA3072B406F09D7095AC9E" " weight=10", -/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 - * "171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" - * " ipv6=[2001:67c:289c:3::77]:443" - * " weight=10", - */ +"171.25.193.77:80 orport=443 id=A10C4F666D27364036B562823E5830BC448E046A" +" ipv6=[2001:67c:289c:3::77]:443" +" weight=10", "176.9.5.116:9030 orport=9001 id=A1EB8D8F1EE28DB98BBB1EAA3B4BEDD303BAB911" " weight=10", "192.34.63.137:9030 orport=443 id=ABCB4965F1FEE193602B50A365425105C889D3F8"

1 0

[tor/master] dns: Always enable DNS request for our DNSPort
by nickm＠torproject.org 20 Sep '16

20 Sep '16

commit 32926b008b6c2a95966c6307ca4f1c920c920d44 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Sep 20 15:00:24 2016 -0400 dns: Always enable DNS request for our DNSPort Commit 41cc1f612bd2112ab7cec0cc4fdeb68c26e231bf introduced a "dns_request" configuration value which wasn't set to 1 for an entry connection on the DNSPort leading to a refusal to resolve the given hostname. This commit set the dns_request flag by default for every entry connection made to the DNSPort. Fixes #20109 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/dnsserv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 6aab1e2..04be3e8 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -136,6 +136,8 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR; } + /* This serves our DNS port so enable DNS request by default. */ + entry_conn->entry_cfg.dns_request = 1; if (q->type == EVDNS_TYPE_A || q->type == EVDNS_QTYPE_ALL) { entry_conn->entry_cfg.ipv4_traffic = 1; entry_conn->entry_cfg.ipv6_traffic = 0;

1 0

[webwml/master] Add new Tor Browser versions: 6.5a3, 6.5a3-hardened
by boklm＠torproject.org 20 Sep '16

20 Sep '16

commit 9345ce0de83a7dcbd0ee155deb2c5937e1c39045 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 20 22:38:51 2016 +0200 Add new Tor Browser versions: 6.5a3, 6.5a3-hardened --- include/versions.wmi | 18 +++++++++--------- projects/torbrowser/RecommendedTBBVersions | 8 +++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 36e7003..f4ee828 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,28 +5,28 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.0</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>6.0.5</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a2</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a3</define-tag> <define-tag version-torbrowserbundle whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundle whitespace=delete>2016-09-16</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a2</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-08-03</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a3</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-09-20</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-09-16</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-09-16</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-08-03</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-08-03</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-09-20</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-09-20</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-09-16</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-09-16</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a2</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-08-03</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a3</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-09-20</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 2b7ff7c..c3b6794 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -8,5 +8,11 @@ "6.5a2-MacOS", "6.5a2-Windows", "6.5a2-hardened", -"6.5a2-hardened-Linux" +"6.5a2-hardened-Linux", +"6.5a3", +"6.5a3-Linux", +"6.5a3-MacOS", +"6.5a3-Windows", +"6.5a3-hardened", +"6.5a3-hardened-Linux" ]

1 0

[trunnel/master] Increment version number to 1.5
by nickm＠torproject.org 20 Sep '16

20 Sep '16

commit a27cad773a903d1691d3587c7fcdcfc76fe7ec03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 20 13:39:12 2016 -0400 Increment version number to 1.5 --- lib/trunnel/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/__init__.py b/lib/trunnel/__init__.py index ec7b001..519c6ec 100644 --- a/lib/trunnel/__init__.py +++ b/lib/trunnel/__init__.py @@ -3,4 +3,4 @@ # a package. # -__version__ = "1.4.6" +__version__ = "1.5"

1 0

[trunnel/master] Add const accessor functions taking const pointers.
by nickm＠torproject.org 20 Sep '16

20 Sep '16

commit 6d4f1c42d72b881ea5b676291059d962ec9157a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 14 16:39:05 2016 -0400 Add const accessor functions taking const pointers. --- lib/trunnel/CodeGen.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/lib/trunnel/CodeGen.py b/lib/trunnel/CodeGen.py index 69ba2e3..78a8991 100644 --- a/lib/trunnel/CodeGen.py +++ b/lib/trunnel/CodeGen.py @@ -1189,6 +1189,7 @@ class AccessorFnGenerator(CodeGenerator): """For a struct field 'FIELD' in a structure called 'TYPE', we generate these functions: TYPE_get_FIELD(x) + TYPE_getconst_FIELD(x) TYPE_set_FIELD(x, v) TYPE_set0_FIELD(x, v) The 'get' function returns the current value of the field in a @@ -1206,6 +1207,13 @@ class AccessorFnGenerator(CodeGenerator): self.w("{\n" " return inp->%s;\n" "}\n" % sms.c_name) + self.docstring("As %s_get_%s, but take and return a const pointer" + %(st,nm)) + self.declaration("const %s"%tp, + "%s_getconst_%s(const %s_t *inp)" % (st, nm, st)) + self.w("{\n" + " return %s_get_%s((%s_t*) inp);\n" + "}\n" %(st, nm, st)) self.docstring("Set the value of the %s field of the %s_t in 'inp' to " "'val'. Free the old value if any. Steals the reference" @@ -1236,8 +1244,10 @@ class AccessorFnGenerator(CodeGenerator): """For a fixed-length array field 'FIELD' in a structure called 'TYPE', we generate these functions: TYPE_get_FIELD(x, index) + TYPE_getconst_FIELD(x, index) TYPE_getlen_FIELD(x) TYPE_getarray_FIELD(x) + TYPE_getconstarray_FIELD(x) TYPE_set_FIELD(x, index, v) TYPE_set0_FIELD(x, index, v) @@ -1255,10 +1265,12 @@ class AccessorFnGenerator(CodeGenerator): """ st = self.structName nm = sfa.c_fn_name + extraconst = "" if str(sfa.basetype) == 'char': elttype = 'char' elif type(sfa.basetype) == str: elttype = "struct %s_st *" % sfa.basetype + extraconst = " const " else: elttype = "uint%d_t" % sfa.basetype.width @@ -1276,13 +1288,21 @@ class AccessorFnGenerator(CodeGenerator): self.docstring("""Return the element at position 'idx' of the fixed array field %s of the %s_t in 'inp'.""" % (nm, st)) - self.declaration(elttype, '%s_get_%s(const %s_t *inp, size_t idx)' + self.declaration(elttype, '%s_get_%s(%s_t *inp, size_t idx)' % (st, nm, st)) self.w("{\n" " trunnel_assert(idx < %s);\n" " return inp->%s[idx];\n" "}\n\n" % (sfa.width, sfa.c_name)) + self.docstring("As %s_get_%s, but take and return a const pointer" + %(st,nm)) + self.declaration(extraconst+elttype, + "%s_getconst_%s(const %s_t *inp, size_t idx)" % (st, nm, st)) + self.w("{\n" + " return %s_get_%s((%s_t*)inp, idx);\n" + "}\n" %(st, nm, st)) + freestr = "" if type(sfa.basetype) == str: freestr = " Free the previous value, if any." @@ -1321,6 +1341,14 @@ class AccessorFnGenerator(CodeGenerator): " return inp->%s;\n" "}\n") % (sfa.c_name)) + self.docstring("As %s_get_%s, but take and return a const pointer" + %(st,nm)) + self.declaration("const %s %s *"%(elttype,extraconst), + "%s_getconstarray_%s(const %s_t *inp)" % (st, nm, st)) + self.w("{\n" + " return (const %s %s *)%s_getarray_%s((%s_t*)inp);\n" + "}\n" %(elttype, extraconst, st, nm, st)) + def visitSMLenConstrained(self, sml): sml.visitChildren(self) @@ -1339,8 +1367,10 @@ class AccessorFnGenerator(CodeGenerator): """For a variable-length array field 'FIELD' in a structure called 'TYPE', we generate these functions: TYPE_get_FIELD(x, index) + TYPE_getconst_FIELD(x, index) TYPE_getlen_FIELD(x) TYPE_getarray_FIELD(x) + TYPE_getconstarray_FIELD(x) TYPE_set_FIELD(x, index, v) TYPE_set0_FIELD(x, index, v) @@ -1361,8 +1391,10 @@ class AccessorFnGenerator(CodeGenerator): st = self.structName nm = sva.c_fn_name + extraconst = "" if type(sva.basetype) == str: elttype = "struct %s_st *" % sva.basetype + extraconst = " const " elif str(sva.basetype) == 'char': elttype = 'char' else: @@ -1391,6 +1423,14 @@ class AccessorFnGenerator(CodeGenerator): " return TRUNNEL_DYNARRAY_GET(&inp->%s, idx);\n" "}\n\n" % nm) + self.docstring("As %s_get_%s, but take and return a const pointer" + %(st,nm)) + self.declaration(extraconst+elttype, + "%s_getconst_%s(const %s_t *inp, size_t idx)" % (st, nm, st)) + self.w("{\n" + " return %s_get_%s((%s_t*)inp, idx);\n" + "}\n" %(st, nm, st)) + freestr = "" if type(sva.basetype) == str: freestr = " Free the previous value, if any." @@ -1448,6 +1488,13 @@ class AccessorFnGenerator(CodeGenerator): self.w(("{\n" " return inp->%s.elts_;\n" "}\n") % (sva.c_name)) + self.docstring("As %s_get_%s, but take and return a const pointer" + %(st,nm)) + self.declaration("const %s %s *"%(elttype,extraconst), + "%s_getconstarray_%s(const %s_t *inp)" % (st, nm, st)) + self.w("{\n" + " return (const %s %s *)%s_getarray_%s((%s_t*)inp);\n" + "}\n" %(elttype, extraconst, st, nm, st)) if type(sva.basetype) == str: fill = "Fill extra elements with NULL; free removed elements." @@ -1571,7 +1618,7 @@ class AccessorFnGenerator(CodeGenerator): self.docstring( "Return the value of the %s field of the %s_t in 'inp'" % (nm, st)) - self.declaration("const char *", "%s_get_%s(%s_t *inp)" % (st, nm, st)) + self.declaration("const char *", "%s_get_%s(const %s_t *inp)" % (st, nm, st)) self.w("{\n" " return inp->%s;\n" "}\n" % sms.c_name)

1 0