[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
commit a8b607bfddd1acf2896cb12dd80389e4b1d66a24 Merge: f527a80 9ebe202 Author: Nick Mathewson Date: Tue Sep 20 19:30:38 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +--- 2 files changed, 20 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.8] Don't look at any routerstatus_t when the networkstatus is inconsistent
commit 9b5a19c64b8195298753b3cd7059e8fcaaabe5bd
Author: Nick Mathewson
Date: Mon Sep 19 12:03:58 2016 -0400
Don't look at any routerstatus_t when the networkstatus is inconsistent
For a brief moment in networkstatus_set_current_consensus(), the old
consensus has been freed, but the node_t objects still have dead
pointers to the routerstatus_t objects within it. During that
interval, we absolutely must not do anything that would cause Tor to
look at those dangling pointers.
Unfortunately, calling the (badly labeled!) current_consensus macro
or anything else that calls into we_use_microdescriptors_for_circuits(),
can make us look at the nodelist.
The fix is to make sure we identify the main consensus flavor
_outside_ the danger zone, and to make the danger zone much much
smaller.
Fixes bug 20103. This bug has been implicitly present for AGES; we
just got lucky for a very long time. It became a crash bug in
0.2.8.2-alpha when we merged 35bbf2e4a4e8ccb to make
find_dl_schedule start looking at the consensus, and 4460feaf2850ef0
which made node_get_all_orports less (accidentally) tolerant of
nodes with a valid ri pointer but dangling rs pointer.
---
changes/bug20103 | 7 +++
src/or/networkstatus.c | 24 +---
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/changes/bug20103 b/changes/bug20103
new file mode 100644
index 000..c2b81d3
--- /dev/null
+++ b/changes/bug20103
@@ -0,0 +1,7 @@
+ o Major bug fixes (crash):
+
+- Fix a complicated crash bug that could affect Tor clients
+ configured to use bridges when replacing a networkstatus consensus
+ in which one of their bridges was mentioned. OpenBSD users saw
+ more crashes here, but all platforms were potentially affected.
+ Fixes bug 20103; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 51fc011..1cedfef 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1631,7 +1631,9 @@ networkstatus_set_current_consensus(const char *consensus,
if (r != 1 && dl_certs)
authority_certs_fetch_missing(c, now);
- if (flav == usable_consensus_flavor()) {
+ const int is_usable_flavor = flav == usable_consensus_flavor();
+
+ if (is_usable_flavor) {
notify_control_networkstatus_changed(current_consensus, c);
}
if (flav == FLAV_NS) {
@@ -1674,20 +1676,12 @@ networkstatus_set_current_consensus(const char
*consensus,
}
}
- /* Reset the failure count only if this consensus is actually valid. */
- if (c->valid_after <= now && now <= c->valid_until) {
-download_status_reset(&consensus_dl_status[flav]);
- } else {
-if (!from_cache)
- download_status_failed(&consensus_dl_status[flav], 0);
- }
+ if (is_usable_flavor) {
+nodelist_set_consensus(c);
- if (flav == usable_consensus_flavor()) {
/* NM Microdescs: needs a non-ns variant. NM*/
update_consensus_networkstatus_fetch_time(now);
-nodelist_set_consensus(current_consensus);
-
dirvote_recalculate_timing(options, now);
routerstatus_list_update_named_server_map();
@@ -1711,6 +1705,14 @@ networkstatus_set_current_consensus(const char
*consensus,
current_consensus);
}
+ /* Reset the failure count only if this consensus is actually valid. */
+ if (c->valid_after <= now && now <= c->valid_until) {
+download_status_reset(&consensus_dl_status[flav]);
+ } else {
+if (!from_cache)
+ download_status_failed(&consensus_dl_status[flav], 0);
+ }
+
if (directory_caches_dir_info(options)) {
dirserv_set_cached_consensus_networkstatus(consensus,
flavor,
___
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.8] Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8
commit 9ebe202da0c56ed6c006a0410a636a9e99d111f7 Merge: 19a9872 9b5a19c Author: Nick Mathewson Date: Tue Sep 20 19:30:24 2016 -0400 Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8 changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +--- 2 files changed, 20 insertions(+), 11 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 remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8
commit 9ebe202da0c56ed6c006a0410a636a9e99d111f7 Merge: 19a9872 9b5a19c Author: Nick Mathewson Date: Tue Sep 20 19:30:24 2016 -0400 Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8 changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +--- 2 files changed, 20 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.8] Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8
commit 9ebe202da0c56ed6c006a0410a636a9e99d111f7 Merge: 19a9872 9b5a19c Author: Nick Mathewson Date: Tue Sep 20 19:30:24 2016 -0400 Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8 changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +--- 2 files changed, 20 insertions(+), 11 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.8'
commit 62ee4f185f984f11d75522eedcee92d1f15fc7a6
Merge: 06d99aa 9ebe202
Author: Nick Mathewson
Date: Tue Sep 20 19:30:45 2016 -0400
Merge branch 'maint-0.2.8'
changes/bug20103 | 7 +++
src/or/networkstatus.c | 24 +---
2 files changed, 20 insertions(+), 11 deletions(-)
diff --cc src/or/networkstatus.c
index 72af505,1cedfef..28f5b42
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@@ -1731,9 -1629,11 +1731,11 @@@ networkstatus_set_current_consensus(con
/* Are we missing any certificates at all? */
if (r != 1 && dl_certs)
-authority_certs_fetch_missing(c, now);
+authority_certs_fetch_missing(c, now, source_dir);
- if (flav == usable_consensus_flavor()) {
+ const int is_usable_flavor = flav == usable_consensus_flavor();
+
+ if (is_usable_flavor) {
notify_control_networkstatus_changed(current_consensus, c);
}
if (flav == FLAV_NS) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Don't look at any routerstatus_t when the networkstatus is inconsistent
commit 9b5a19c64b8195298753b3cd7059e8fcaaabe5bd
Author: Nick Mathewson
Date: Mon Sep 19 12:03:58 2016 -0400
Don't look at any routerstatus_t when the networkstatus is inconsistent
For a brief moment in networkstatus_set_current_consensus(), the old
consensus has been freed, but the node_t objects still have dead
pointers to the routerstatus_t objects within it. During that
interval, we absolutely must not do anything that would cause Tor to
look at those dangling pointers.
Unfortunately, calling the (badly labeled!) current_consensus macro
or anything else that calls into we_use_microdescriptors_for_circuits(),
can make us look at the nodelist.
The fix is to make sure we identify the main consensus flavor
_outside_ the danger zone, and to make the danger zone much much
smaller.
Fixes bug 20103. This bug has been implicitly present for AGES; we
just got lucky for a very long time. It became a crash bug in
0.2.8.2-alpha when we merged 35bbf2e4a4e8ccb to make
find_dl_schedule start looking at the consensus, and 4460feaf2850ef0
which made node_get_all_orports less (accidentally) tolerant of
nodes with a valid ri pointer but dangling rs pointer.
---
changes/bug20103 | 7 +++
src/or/networkstatus.c | 24 +---
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/changes/bug20103 b/changes/bug20103
new file mode 100644
index 000..c2b81d3
--- /dev/null
+++ b/changes/bug20103
@@ -0,0 +1,7 @@
+ o Major bug fixes (crash):
+
+- Fix a complicated crash bug that could affect Tor clients
+ configured to use bridges when replacing a networkstatus consensus
+ in which one of their bridges was mentioned. OpenBSD users saw
+ more crashes here, but all platforms were potentially affected.
+ Fixes bug 20103; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 51fc011..1cedfef 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1631,7 +1631,9 @@ networkstatus_set_current_consensus(const char *consensus,
if (r != 1 && dl_certs)
authority_certs_fetch_missing(c, now);
- if (flav == usable_consensus_flavor()) {
+ const int is_usable_flavor = flav == usable_consensus_flavor();
+
+ if (is_usable_flavor) {
notify_control_networkstatus_changed(current_consensus, c);
}
if (flav == FLAV_NS) {
@@ -1674,20 +1676,12 @@ networkstatus_set_current_consensus(const char
*consensus,
}
}
- /* Reset the failure count only if this consensus is actually valid. */
- if (c->valid_after <= now && now <= c->valid_until) {
-download_status_reset(&consensus_dl_status[flav]);
- } else {
-if (!from_cache)
- download_status_failed(&consensus_dl_status[flav], 0);
- }
+ if (is_usable_flavor) {
+nodelist_set_consensus(c);
- if (flav == usable_consensus_flavor()) {
/* NM Microdescs: needs a non-ns variant. NM*/
update_consensus_networkstatus_fetch_time(now);
-nodelist_set_consensus(current_consensus);
-
dirvote_recalculate_timing(options, now);
routerstatus_list_update_named_server_map();
@@ -1711,6 +1705,14 @@ networkstatus_set_current_consensus(const char
*consensus,
current_consensus);
}
+ /* Reset the failure count only if this consensus is actually valid. */
+ if (c->valid_after <= now && now <= c->valid_until) {
+download_status_reset(&consensus_dl_status[flav]);
+ } else {
+if (!from_cache)
+ download_status_failed(&consensus_dl_status[flav], 0);
+ }
+
if (directory_caches_dir_info(options)) {
dirserv_set_cached_consensus_networkstatus(consensus,
flavor,
___
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.8] Don't look at any routerstatus_t when the networkstatus is inconsistent
commit 9b5a19c64b8195298753b3cd7059e8fcaaabe5bd
Author: Nick Mathewson
Date: Mon Sep 19 12:03:58 2016 -0400
Don't look at any routerstatus_t when the networkstatus is inconsistent
For a brief moment in networkstatus_set_current_consensus(), the old
consensus has been freed, but the node_t objects still have dead
pointers to the routerstatus_t objects within it. During that
interval, we absolutely must not do anything that would cause Tor to
look at those dangling pointers.
Unfortunately, calling the (badly labeled!) current_consensus macro
or anything else that calls into we_use_microdescriptors_for_circuits(),
can make us look at the nodelist.
The fix is to make sure we identify the main consensus flavor
_outside_ the danger zone, and to make the danger zone much much
smaller.
Fixes bug 20103. This bug has been implicitly present for AGES; we
just got lucky for a very long time. It became a crash bug in
0.2.8.2-alpha when we merged 35bbf2e4a4e8ccb to make
find_dl_schedule start looking at the consensus, and 4460feaf2850ef0
which made node_get_all_orports less (accidentally) tolerant of
nodes with a valid ri pointer but dangling rs pointer.
---
changes/bug20103 | 7 +++
src/or/networkstatus.c | 24 +---
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/changes/bug20103 b/changes/bug20103
new file mode 100644
index 000..c2b81d3
--- /dev/null
+++ b/changes/bug20103
@@ -0,0 +1,7 @@
+ o Major bug fixes (crash):
+
+- Fix a complicated crash bug that could affect Tor clients
+ configured to use bridges when replacing a networkstatus consensus
+ in which one of their bridges was mentioned. OpenBSD users saw
+ more crashes here, but all platforms were potentially affected.
+ Fixes bug 20103; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 51fc011..1cedfef 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1631,7 +1631,9 @@ networkstatus_set_current_consensus(const char *consensus,
if (r != 1 && dl_certs)
authority_certs_fetch_missing(c, now);
- if (flav == usable_consensus_flavor()) {
+ const int is_usable_flavor = flav == usable_consensus_flavor();
+
+ if (is_usable_flavor) {
notify_control_networkstatus_changed(current_consensus, c);
}
if (flav == FLAV_NS) {
@@ -1674,20 +1676,12 @@ networkstatus_set_current_consensus(const char
*consensus,
}
}
- /* Reset the failure count only if this consensus is actually valid. */
- if (c->valid_after <= now && now <= c->valid_until) {
-download_status_reset(&consensus_dl_status[flav]);
- } else {
-if (!from_cache)
- download_status_failed(&consensus_dl_status[flav], 0);
- }
+ if (is_usable_flavor) {
+nodelist_set_consensus(c);
- if (flav == usable_consensus_flavor()) {
/* NM Microdescs: needs a non-ns variant. NM*/
update_consensus_networkstatus_fetch_time(now);
-nodelist_set_consensus(current_consensus);
-
dirvote_recalculate_timing(options, now);
routerstatus_list_update_named_server_map();
@@ -1711,6 +1705,14 @@ networkstatus_set_current_consensus(const char
*consensus,
current_consensus);
}
+ /* Reset the failure count only if this consensus is actually valid. */
+ if (c->valid_after <= now && now <= c->valid_until) {
+download_status_reset(&consensus_dl_status[flav]);
+ } else {
+if (!from_cache)
+ download_status_failed(&consensus_dl_status[flav], 0);
+ }
+
if (directory_caches_dir_info(options)) {
dirserv_set_cached_consensus_networkstatus(consensus,
flavor,
___
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.8'
commit 06d99aa2c42de6013b3fa55ac03c661f57f90047 Merge: 32926b0 19a9872 Author: Nick Mathewson Date: Tue Sep 20 19:29:17 2016 -0400 Merge branch 'maint-0.2.8' src/or/fallback_dirs.inc | 46 ++ 1 file changed, 30 insertions(+), 16 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Update hard-coded fallback list based on pre-0.2.9 checks
commit c6d51b45770497227115f1a1d474cb5a8d582dd9 Author: teor 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:2 orport=1 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "194.150.168.79:2 orport=1 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.
[tor-commits] [tor/release-0.2.8] Update hard-coded fallback list based on pre-0.2.9 checks
commit c6d51b45770497227115f1a1d474cb5a8d582dd9 Author: teor 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:2 orport=1 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "194.150.168.79:2 orport=1 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.
[tor-commits] [tor/release-0.2.8] fixup! Update hard-coded fallback list based on pre-0.2.9 checks
commit 19a9872be2e91e367b85795186c29a077223e91e Author: teor 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" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
commit f527a809b3adbb1379465f2c5c7238502c2f3877 Merge: 8a163e9 19a9872 Author: Nick Mathewson 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(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] fixup! Update hard-coded fallback list based on pre-0.2.9 checks
commit 19a9872be2e91e367b85795186c29a077223e91e Author: teor 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" ___ 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.8] Update hard-coded fallback list based on pre-0.2.9 checks
commit c6d51b45770497227115f1a1d474cb5a8d582dd9 Author: teor 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:2 orport=1 id=29F1020B94BE25E6BE1AD13E93CE19D2131B487C" -" weight=10", +/* Fallback was on 0.2.8.6 list, but went down before 0.2.9 + * "194.150.168.79:2 orport=1 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.
[tor-commits] [tor/maint-0.2.8] fixup! Update hard-coded fallback list based on pre-0.2.9 checks
commit 19a9872be2e91e367b85795186c29a077223e91e Author: teor 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" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] dns: Always enable DNS request for our DNSPort
commit 32926b008b6c2a95966c6307ca4f1c920c920d44
Author: David Goulet
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
---
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;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Add new Tor Browser versions: 6.5a3, 6.5a3-hardened
commit 9345ce0de83a7dcbd0ee155deb2c5937e1c39045 Author: Nicolas Vigier 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 @@ maint-6.0 6.0.5 -6.5a2 +6.5a3 6.0.5 2016-09-16 -6.5a2 -2016-08-03 +6.5a3 +2016-09-20 6.0.5 2016-09-16 6.0.5 2016-09-16 -6.5a2 -2016-08-03 -6.5a2 -2016-08-03 +6.5a3 +2016-09-20 +6.5a3 +2016-09-20 6.0.5 2016-09-16 6.0.5 2016-09-16 -6.5a2 -2016-08-03 +6.5a3 +2016-09-20 ../dist/torbrowser//tor-win32-.zip 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" ] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [trunnel/master] Add const accessor functions taking const pointers.
commit 6d4f1c42d72b881ea5b676291059d962ec9157a2
Author: Nick Mathewson
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
[tor-commits] [trunnel/master] Increment version number to 1.5
commit a27cad773a903d1691d3587c7fcdcfc76fe7ec03 Author: Nick Mathewson 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" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-6.0] Fix bug in changelog
commit ae4e1c26e4dd6ba37fa7b930c28b6a2c9db4d5ca Author: Georg Koppen Date: Tue Sep 20 14:23:01 2016 + Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a8f341b..ecb6572 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.0.5 -- September 16 * Update Firefox to 45.4.0esr * Update Tor to 0.2.8.7 * Update Torbutton to 1.9.5.7 - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Update HTTPS-Everywhere to 5.2.4 * Bug 20092: Rotate ports for default obfs4 bridges ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/hardened-builds] Fix bug in changelog
commit 369588783e9ffb3b2441e226696798df395382f4 Author: Georg Koppen Date: Tue Sep 20 14:22:22 2016 + Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 20f120b..ff3164f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,7 @@ Tor Browser 6.5a3 -- September 20 2016 * Update Torbutton to 1.9.6.4 * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git * Bug 17767: Make "JavaScript disabled" more visible in Security Slider - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Bug 19837: Whitelist internal URLs that Firefox requires for media * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Fix bug in changelog
commit 7014b0ff1e63b01353801c40d2db9a7c54970182 Author: Georg Koppen Date: Tue Sep 20 14:17:01 2016 + Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 302f5d5..881f25f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,7 @@ Tor Browser 6.5a3 -- September 20 2016 * Update Torbutton to 1.9.6.4 * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git * Bug 17767: Make "JavaScript disabled" more visible in Security Slider - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Bug 19837: Whitelist internal URLs that Firefox requires for media * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic @@ -42,7 +42,7 @@ Tor Browser 6.0.5 -- September 16 * Update Firefox to 45.4.0esr * Update Tor to 0.2.8.7 * Update Torbutton to 1.9.5.7 - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Update HTTPS-Everywhere to 5.2.4 * Bug 20092: Rotate ports for default obfs4 bridges ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [snowflake/master] initial client roundtrip estimate on broker
commit 47e1338290359755308825ca66008e2df94cab60
Author: Serene H
Date: Tue Sep 20 06:26:21 2016 -0700
initial client roundtrip estimate on broker
---
broker/broker.go | 25 ++---
broker/metrics.go | 17 +
client/torrc | 2 +-
proxy/snowflake.coffee | 1 +
4 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/broker/broker.go b/broker/broker.go
index 3c50ac9..3561141 100644
--- a/broker/broker.go
+++ b/broker/broker.go
@@ -26,6 +26,7 @@ type BrokerContext struct {
// the second http POST.
idToSnowflake map[string]*Snowflake
proxyPollschan *ProxyPoll
+ metrics *Metrics
}
func NewBrokerContext() *BrokerContext {
@@ -35,6 +36,7 @@ func NewBrokerContext() *BrokerContext {
snowflakes:snowflakes,
idToSnowflake: make(map[string]*Snowflake),
proxyPolls:make(chan *ProxyPoll),
+ metrics: new(Metrics),
}
}
@@ -67,7 +69,7 @@ func (ctx *BrokerContext) RequestOffer(id string) []byte {
request.id = id
request.offerChannel = make(chan []byte)
ctx.proxyPolls <- request
- // Block until an offer is available...
+ // Block until an offer is available, or timeout which sends a nil
offer.
offer := <-request.offerChannel
return offer
}
@@ -96,6 +98,8 @@ func (ctx *BrokerContext) Broker() {
}
// Create and add a Snowflake to the heap.
+// Required to keep track of proxies between providing them
+// with an offer and awaiting their second POST with an answer.
func (ctx *BrokerContext) AddSnowflake(id string) *Snowflake {
snowflake := new(Snowflake)
snowflake.id = id
@@ -141,29 +145,32 @@ snowflake proxy, which responds with the SDP answer to be
sent in
the HTTP response back to the client.
*/
func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) {
+ startTime := time.Now()
offer, err := ioutil.ReadAll(r.Body)
if nil != err {
log.Println("Invalid data.")
w.WriteHeader(http.StatusBadRequest)
return
}
-
- // Find the most available snowflake proxy, and pass the offer to it.
- // TODO: Needs improvement - maybe shouldn't immediately fail?
+ // Immediately fail if there are no snowflakes available.
if ctx.snowflakes.Len() <= 0 {
log.Println("Client: No snowflake proxies available.")
w.WriteHeader(http.StatusServiceUnavailable)
return
}
+ // Otherwise, find the most available snowflake proxy, and pass the
offer to it.
snowflake := heap.Pop(ctx.snowflakes).(*Snowflake)
- defer delete(ctx.idToSnowflake, snowflake.id)
+ delete(ctx.idToSnowflake, snowflake.id)
snowflake.offerChannel <- offer
- // Wait for the answer to be returned on the channel.
+ // Wait for the answer to be returned on the channel or timeout.
select {
case answer := <-snowflake.answerChannel:
log.Println("Client: Retrieving answer")
w.Write(answer)
+ // Initial tracking of elapsed time.
+ ctx.metrics.clientRoundtripEstimate = time.Since(startTime) /
+ time.Millisecond
case <-time.After(time.Second * ClientTimeout):
log.Println("Client: Timed out.")
w.WriteHeader(http.StatusGatewayTimeout)
@@ -196,7 +203,11 @@ func proxyAnswers(ctx *BrokerContext, w
http.ResponseWriter, r *http.Request) {
}
func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) {
- s := fmt.Sprintf("current: %d", ctx.snowflakes.Len())
+ s := fmt.Sprintf("current snowflakes available: %d\n",
ctx.snowflakes.Len())
+ for _, snowflake := range ctx.idToSnowflake {
+ s += fmt.Sprintf("\nsnowflake %d: %s", snowflake.index,
snowflake.id)
+ }
+ s += fmt.Sprintf("\n\nroundtrip avg: %d",
ctx.metrics.clientRoundtripEstimate)
w.Write([]byte(s))
}
diff --git a/broker/metrics.go b/broker/metrics.go
new file mode 100644
index 000..f64d1cc
--- /dev/null
+++ b/broker/metrics.go
@@ -0,0 +1,17 @@
+package snowflake_broker
+
+import (
+ // "golang.org/x/net/internal/timeseries"
+ "time"
+)
+
+// Implements Observable
+type Metrics struct {
+ // snowflakes timeseries.Float
+ clientRoundtripEstimate time.Duration
+}
+
+func NewMetrics() *Metrics {
+ m := new(Metrics)
+ return m
+}
diff --git a/client/torrc b/client/torrc
index d066454..6912760 100644
--- a/client/torrc
+++ b/client/torrc
@@ -5,6 +5,6 @@ ClientTransportPlugin snowflake exec ./client \
-url https://snowflake-reg.appspot.com/ \
-front www.google.com \
-ice stun:stun.l.google.com:19302 \
--max 1
+-max 3
Bridge snowflake 0.0.3.0:1
diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coff
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit aa62c74a1a99063863062b66df7f47c87dd9ef44 Author: Translation commit bot Date: Tue Sep 20 10:46:33 2016 + Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 8600bce..d54eda20 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -47,7 +47,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
commit 9fc1096147c346fb5ecf16e141b62dcfc7a09295 Author: Translation commit bot Date: Tue Sep 20 10:18:11 2016 + Update translations for tor-messenger-prefsdtd --- zh_CN/prefs.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/prefs.dtd b/zh_CN/prefs.dtd index ea67639..066dcac 100644 --- a/zh_CN/prefs.dtd +++ b/zh_CN/prefs.dtd @@ -13,10 +13,10 @@ - - - - + + + + \ No newline at end of file ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
