[tor-commits] [chutney/master] Ignore a variant of the "Valid-After times do not match" warning
commit 373346998014b14cfe9e75a66854226178cd9d69 Author: teor Date: Wed Apr 18 11:15:45 2018 +1000 Ignore a variant of the "Valid-After times do not match" warning Closes #25829 --- tools/ignore.warnings | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ignore.warnings b/tools/ignore.warnings index 463ce6c..48c7570 100644 --- a/tools/ignore.warnings +++ b/tools/ignore.warnings @@ -57,6 +57,7 @@ This copy of Tor was compiled.*to run in a non-anonymous mode # Chutney does not use DNS by default Unable to parse '.*', or no nameservers in '.*' # Tor Bug 21525? +Unable to add signatures to consensus: Valid-After times do not match Unable to store signatures posted by .* Mismatched digest Unable to store signatures posted by .* Valid-After times do not match # We ignore consensus failure warnings ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [snowflake/master] Fix text-shadow CSS.
commit fd9efa10016c7b361dc1829f370e879aa08ffe45
Author: David Fifield
Date: Tue Apr 17 17:21:46 2018 -0700
Fix text-shadow CSS.
The semicolons made it look like the end of a declaration. I got these
errors in the Firefox console:
Expected declaration but found â1pxâ. Skipped to next declaration. 1
embed.html:29:17
Expected declaration but found â-1pxâ. Skipped to next declaration. 1
embed.html:30:17
---
proxy/static/embed.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/proxy/static/embed.html b/proxy/static/embed.html
index d1d4e77..65303b5 100644
--- a/proxy/static/embed.html
+++ b/proxy/static/embed.html
@@ -25,8 +25,8 @@
font-variant: small-caps;
text-shadow: 0 0 5px #fef,
0 1px 2px #fef,
- 0 -1px 2px #fef;
- 1px 0px 3px #fef;
+ 0 -1px 2px #fef,
+ 1px 0px 3px #fef,
-1px 0px 3px #fef;
}
.active {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add an initialization case to node_get_prim_dirport
commit 1abe0a5769f3fe7c2a36975acd8ab1e861925f51 Author: Nick Mathewson Date: Tue Apr 17 19:41:51 2018 -0400 Add an initialization case to node_get_prim_dirport Fixes a bug found by scan-build; bugfix on c2fa743806acc. Bug not in any released Tor. --- src/or/nodelist.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 81a5c944a..bbcfb6cff 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1583,6 +1583,11 @@ node_get_prim_dirport(const node_t *node, tor_addr_port_t *ap_out) node_assert_ok(node); tor_assert(ap_out); + /* Clear the address, as a safety precaution if calling functions ignore the + * return value */ + tor_addr_make_null(&ap_out->addr, AF_INET); + ap_out->port = 0; + /* Check ri first, because rewrite_node_address_for_bridge() updates * node->ri with the configured bridge address. */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add a redundant memset to node_get_pref_ipv6_orport()
commit 31a450a5b69a88fd9f38b1ca043952009ffddbf7
Author: Nick Mathewson
Date: Tue Apr 17 19:41:10 2018 -0400
Add a redundant memset to node_get_pref_ipv6_orport()
For whatever reason, clang's scan-build isn't sure that this
function actually initializes its output.
---
src/or/nodelist.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 71eee3fa2..81a5c944a 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1517,6 +1517,7 @@ node_get_pref_ipv6_orport(const node_t *node,
tor_addr_port_t *ap_out)
{
node_assert_ok(node);
tor_assert(ap_out);
+ memset(ap_out, 0, sizeof(*ap_out));
/* Check ri first, because rewrite_node_address_for_bridge() updates
* node->ri with the configured bridge address.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix a copy-and-paste error from 6be994fa717cf73
commit d67d3dd1456edf20e79bd1ba105536bdcdbfc4dc Author: Nick Mathewson Date: Tue Apr 17 19:39:50 2018 -0400 Fix a copy-and-paste error from 6be994fa717cf73 Found by clang's scan-build too. Bug not in any released Tor. --- src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 206274cd3..9c0b321b5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2190,7 +2190,7 @@ options_act(const or_options_t *old_options) if (options->BandwidthRate != old_options->BandwidthRate || options->BandwidthBurst != old_options->BandwidthBurst || -options->BandwidthRate != old_options->BandwidthRate || +options->RelayBandwidthRate != old_options->RelayBandwidthRate || options->RelayBandwidthBurst != old_options->RelayBandwidthBurst) connection_bucket_adjust(options); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix a pointer size error in test_bridges.c
commit 3bf9974b6c4ee9f2a8204c058e1b7c206b99d620 Author: Nick Mathewson Date: Tue Apr 17 19:44:09 2018 -0400 Fix a pointer size error in test_bridges.c sizeof(ret) is the size of the pointer, not the size of what it points to. Fortunately, we already have a function to compare tor_addr_port_t values for equality. Bugfix on c2c5b13e5d8a77e; bug not in any released Tor. Found by clang's scan-build. --- src/test/test_bridges.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c index b5bd27e09..c4a4cacd9 100644 --- a/src/test/test_bridges.c +++ b/src/test/test_bridges.c @@ -234,7 +234,7 @@ test_bridges_get_configured_bridge_by_orports_digest(void *arg) ret = get_configured_bridge_by_orports_digest(digest, orports); tt_ptr_op(ret, OP_NE, NULL); - tt_mem_op(addrport1, OP_EQ, bridge_get_addr_port(ret), sizeof(ret)); + tt_assert(tor_addr_port_eq(addrport1, bridge_get_addr_port(ret))); done: smartlist_free(orports); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [user-manual/master] Fixing image
commit ea459133509ec40b50a0fa926890e9bf428e8f5c Author: Colin Childs Date: Tue Apr 17 18:26:18 2018 -0500 Fixing image --- C/media/circumvention/configure.png | Bin 221675 -> 245540 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/C/media/circumvention/configure.png b/C/media/circumvention/configure.png index 7cebfab..8dad78e 100644 Binary files a/C/media/circumvention/configure.png and b/C/media/circumvention/configure.png differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [snowflake/master] Only unset the header for the page being rendered
commit 433a47fdf7c272493b2183e63a7d0ee811a0b12c Author: Arlo Breault Date: Tue Apr 17 16:43:01 2018 -0400 Only unset the header for the page being rendered --- proxy/static/.htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/static/.htaccess b/proxy/static/.htaccess index ab8cfab..f733194 100644 --- a/proxy/static/.htaccess +++ b/proxy/static/.htaccess @@ -1,3 +1,3 @@ - + Header always unset X-Frame-Options - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [snowflake/master] Add an .htaccess file to unset X-Frame-Options
commit b441ae4bf4ecefd26c976a903f95de3346477737 Author: Arlo Breault Date: Tue Apr 17 16:05:39 2018 -0400 Add an .htaccess file to unset X-Frame-Options --- proxy/static/.htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proxy/static/.htaccess b/proxy/static/.htaccess new file mode 100644 index 000..ab8cfab --- /dev/null +++ b/proxy/static/.htaccess @@ -0,0 +1,3 @@ + +Header always unset X-Frame-Options + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 6a1595f88f17b45b9f29fa95aa585b11131c1d26 Author: Translation commit bot Date: Tue Apr 17 19:45:31 2018 + Update translations for https_everywhere --- hi/https-everywhere.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hi/https-everywhere.properties b/hi/https-everywhere.properties index 5d905b8c7..6d39078ed 100644 --- a/hi/https-everywhere.properties +++ b/hi/https-everywhere.properties @@ -1,5 +1,5 @@ -https-everywhere.menu.globalEnable = हर à¤à¤à¤¹ HTTPS सà¤à¥à¤·à¤® -https-everywhere.menu.globalDisable = हर à¤à¤à¤¹ HTTPS ठà¤à¥à¤·à¤® +https-everywhere.menu.globalEnable = हर à¤à¤à¤¹ HTTPS लाà¤à¥ à¤à¤°à¥à¤ +https-everywhere.menu.globalDisable = हर à¤à¤à¤¹ HTTPS निषà¥à¤à¥à¤°à¤¿à¤¯ à¤à¤°à¥à¤ https-everywhere.menu.enableDisable = Enable / Disable Rules https-everywhere.menu.noRules = (No Rules for This Page) https-everywhere.menu.unknownRules = (Rules for This Page Unknown) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit 78b628b1764905dbf4df4caf7bf4ccc901e33c3a Author: Translation commit bot Date: Tue Apr 17 18:46:52 2018 + Update translations for abouttor-homepage_completed --- es/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd index 6354df745..2f54c734e 100644 --- a/es/aboutTor.dtd +++ b/es/aboutTor.dtd @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit f93aadb5ec6d046a778523617fabc73c5f9452b1 Author: Translation commit bot Date: Tue Apr 17 18:46:46 2018 + Update translations for abouttor-homepage --- es/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd index 6354df745..2f54c734e 100644 --- a/es/aboutTor.dtd +++ b/es/aboutTor.dtd @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [stem/master] ExitPolicy cache fixes and related corrections
commit c305b7f6fc203568f3cb4a71ca61fb33c8e7423c Merge: 82b22046 9370b14b Author: Damian Johnson Date: Tue Apr 17 09:46:17 2018 -0700 ExitPolicy cache fixes and related corrections Lot of great catches from dmr on #25423. Snagging the most important ones from his branch. https://trac.torproject.org/projects/tor/ticket/25423 stem/control.py | 20 +--- stem/exit_policy.py | 6 ++ 2 files changed, 15 insertions(+), 11 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [stem/master] Deprecate ExitPolicy's get_config_policy function
commit 9370b14bae9daae1ec917f2cd52e2d3ea6634cd1 Author: Damian Johnson Date: Tue Apr 17 09:44:15 2018 -0700 Deprecate ExitPolicy's get_config_policy function Great point by dmr on #25423. Now that we're no longer attempting to make sense of the torrc this function will become less and less reliable over time. --- stem/exit_policy.py | 6 ++ 1 file changed, 6 insertions(+) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 3c13be7e..e921fb3c 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -110,6 +110,12 @@ def get_config_policy(rules, ip_address = None): * ports being optional * the 'private' keyword + .. deprecated:: 1.7.0 + + Tor's torrc parameters lack a formal spec, making it difficult for this + method to be reliable. Callers are encouraged to move to + :func:`~stem.control.Controller.get_exit_policy` instead. + :param str,list rules: comma separated rules or list to be converted :param str ip_address: this relay's IP address for the 'private' policy if it's present, this defaults to the local address ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [stem/master] More eagerly invalidate our exit policy cache
commit 720164398b847dfedde9e2dc9de7a6eb85c18de8
Author: Damian Johnson
Date: Tue Apr 17 09:19:17 2018 -0700
More eagerly invalidate our exit policy cache
Lots of great points on #25423. There's several torrc options that can
adjust
our exit policy so simply invalidating it with any SETCONF call. It's cheap
to
reconstruct the ExitPolicy instance anyway.
---
stem/control.py | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/stem/control.py b/stem/control.py
index 93f8fc19..ed869a8c 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -1072,8 +1072,7 @@ class Controller(BaseController):
if self.is_caching_enabled():
self._set_cache(dict((k, None) for k in event.config), 'getconf')
-if 'exitpolicy' in event.config.keys():
- self._set_cache({'exit_policy': None})
+self._set_cache({'exit_policy': None}) # numerous options can change
our policy
self.add_event_listener(_confchanged_listener, EventType.CONF_CHANGED)
@@ -2410,9 +2409,7 @@ class Controller(BaseController):
to_cache[param] = value
- if param == 'exitpolicy':
-self._set_cache({'exit_policy': None})
- elif 'hidden' in param:
+ if 'hidden' in param:
self._set_cache({'hidden_service_conf': None})
# reset any getinfo parameters that can be changed by a SETCONF
@@ -2422,6 +2419,8 @@ class Controller(BaseController):
self._set_cache(to_cache, 'getconf')
self._set_cache({'get_custom_options': None})
+
+self._set_cache({'exit_policy': None}) # numerous options can change
our policy
else:
log.debug('%s (failed, code: %s, message: %s)' % (query, response.code,
response.message))
immutable_params = [k for k, v in params if
stem.util.str_tools._to_unicode(k).lower() in IMMUTABLE_CONFIG_OPTIONS]
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [stem/master] Fix exit policy caching keys
commit ca93c11caf797546a0bd45574544b7ca9b622383
Author: Damian Johnson
Date: Tue Apr 17 09:09:52 2018 -0700
Fix exit policy caching keys
Oops, great catch from dmr on #25423. We had one spot referring to the key
as
'exit_policy' and two that were 'exitpolicy'. Sandardizing on the former.
---
stem/control.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/stem/control.py b/stem/control.py
index 3db4d35a..93f8fc19 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -1073,7 +1073,7 @@ class Controller(BaseController):
self._set_cache(dict((k, None) for k in event.config), 'getconf')
if 'exitpolicy' in event.config.keys():
- self._set_cache({'exitpolicy': None})
+ self._set_cache({'exit_policy': None})
self.add_event_listener(_confchanged_listener, EventType.CONF_CHANGED)
@@ -2411,7 +2411,7 @@ class Controller(BaseController):
to_cache[param] = value
if param == 'exitpolicy':
-self._set_cache({'exitpolicy': None})
+self._set_cache({'exit_policy': None})
elif 'hidden' in param:
self._set_cache({'hidden_service_conf': None})
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [stem/master] Drop message lock check from get_exit_policy
commit 142db72abfd8b2139096d41581e7cad43ac8981c
Author: Damian Johnson
Date: Tue Apr 17 09:32:47 2018 -0700
Drop message lock check from get_exit_policy
Great catch from dmr on #25423. This method is odd in that it's the only one
using the BaseController's msg_lock. I can't see a reason for this either.
---
stem/control.py | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/stem/control.py b/stem/control.py
index ed869a8c..a91e9588 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -1283,14 +1283,13 @@ class Controller(BaseController):
An exception is only raised if we weren't provided a default response.
"""
-with self._msg_lock:
- policy = self._get_cache('exit_policy')
+policy = self._get_cache('exit_policy')
- if not policy:
-policy =
stem.exit_policy.ExitPolicy(*self.get_info('exit-policy/full').splitlines())
-self._set_cache({'exit_policy': policy})
+if not policy:
+ policy =
stem.exit_policy.ExitPolicy(*self.get_info('exit-policy/full').splitlines())
+ self._set_cache({'exit_policy': policy})
- return policy
+return policy
@with_default()
def get_ports(self, listener_type, default = UNDEFINED):
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fixup timing wheel warnings related to recent WHEEL_BIT change.
commit 31fbbf2377846535848553938f6be233f3092702
Author: Nick Mathewson
Date: Tue Apr 17 12:45:53 2018 -0400
Fixup timing wheel warnings related to recent WHEEL_BIT change.
---
src/ext/timeouts/timeout.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ext/timeouts/timeout.c b/src/ext/timeouts/timeout.c
index 713ec219c..d4b514d2c 100644
--- a/src/ext/timeouts/timeout.c
+++ b/src/ext/timeouts/timeout.c
@@ -150,7 +150,7 @@
#else
#define ctz(n) ctz32(n)
#define clz(n) clz32(n)
-#define fls(n) ((int)(32 - clz32(n)))
+#define fls(n) ((int)(32 - clz32((uint32_t)n)))
#endif
#if WHEEL_BIT == 6
@@ -432,7 +432,7 @@ TIMEOUT_PUBLIC void timeouts_update(struct timeouts *T,
abstime_t curtime) {
* or can be replaced with a simpler operation.
*/
oslot = WHEEL_MASK & (T->curtime >> (wheel *
WHEEL_BIT));
- pending = rotl(((UINT64_C(1) << _elapsed) - 1), oslot);
+ pending = rotl(((WHEEL_C(1) << _elapsed) - 1), oslot);
nslot = WHEEL_MASK & (curtime >> (wheel * WHEEL_BIT));
pending |= rotr(rotl(((WHEEL_C(1) << _elapsed) - 1),
nslot), (int)_elapsed);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] token bucket: Add parens to rate_per_sec_to_rate_per_step()
commit 2bf6f1cd39c102749ee518664036c90ab1dbfc9c Author: Nick Mathewson Date: Tue Apr 17 11:09:55 2018 -0400 token bucket: Add parens to rate_per_sec_to_rate_per_step() Typecasts bind more tightly than division, so we need to do the division first. --- src/common/token_bucket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/token_bucket.c b/src/common/token_bucket.c index d18731b0e..747189e75 100644 --- a/src/common/token_bucket.c +++ b/src/common/token_bucket.c @@ -119,7 +119,7 @@ rate_per_sec_to_rate_per_step(uint32_t rate) */ uint64_t units = (uint64_t) rate * TICKS_PER_STEP; uint32_t val = (uint32_t) -monotime_coarse_stamp_units_to_approx_msec(units) / 1000; +(monotime_coarse_stamp_units_to_approx_msec(units) / 1000); return val ? val : 1; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
commit d8a9c9f2c870bb95c9247f42ae23f727af7d36de Merge: fb3591874 44aa586de Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 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/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b Merge: 93ff1870b f0230ee38 Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 27534e4cf,bf55b7756..3d61f5a61 --- a/.travis.yml +++ b/.travis.yml @@@ -97,9 -96,9 +97,11 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true +- compiler: gcc env: RUST_OPTIONS="" + - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
commit f0230ee38a5031d447758259245a5121ec7e4789 Merge: c5899d5cf ce8e7427b Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Add support for the coveralls.io coverage tool in travis config
commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc +- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 0..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.1] Add support for the coveralls.io coverage tool in travis config
commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc +- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 0..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818. ___ 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.9] Merge branch 'maint-0.2.9' into release-0.2.9
commit d5000fc673c77e06db413a22d456621933e0bd1a Merge: b83991fce d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:13 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 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/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
commit 65fd973754592bb279e1b66ce226eb3e8362b815 Merge: 677789b68 f0230ee38 Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 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/release-0.2.9] Add support for the coveralls.io coverage tool in travis config
commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc +- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 0..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
commit 02ac1822abe329fee343bdab145e4bacfcfc76fe Merge: ae0ee0202 ce8e7427b Author: Nick Mathewson Date: Tue Apr 17 10:48:17 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 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/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit f0230ee38a5031d447758259245a5121ec7e4789 Merge: c5899d5cf ce8e7427b Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 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/release-0.3.3] Add support for the coveralls.io coverage tool in travis config
commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc +- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 0..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818. ___ 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.3.2' into maint-0.3.3
commit 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b Merge: 93ff1870b f0230ee38 Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 27534e4cf,bf55b7756..3d61f5a61 --- a/.travis.yml +++ b/.travis.yml @@@ -97,9 -96,9 +97,11 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true +- compiler: gcc env: RUST_OPTIONS="" + - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no ___ 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.3.3'
commit 002c5ca5d1986a0fad0c961113e512d47c2edfe0 Merge: c5bbf72fb 44aa586de Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.3' .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
commit f0230ee38a5031d447758259245a5121ec7e4789 Merge: c5899d5cf ce8e7427b Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 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.3.1' into maint-0.3.2
commit f0230ee38a5031d447758259245a5121ec7e4789 Merge: c5899d5cf ce8e7427b Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b Merge: 93ff1870b f0230ee38 Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 27534e4cf,bf55b7756..3d61f5a61 --- a/.travis.yml +++ b/.travis.yml @@@ -97,9 -96,9 +97,11 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true +- compiler: gcc env: RUST_OPTIONS="" + - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add support for the coveralls.io coverage tool in travis config
commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc +- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 0..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818. ___ 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.9' into maint-0.3.1
commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Add support for the coveralls.io coverage tool in travis config
commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc +- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 0..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818. ___ 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.9] Add support for the coveralls.io coverage tool in travis config
commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc +- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 0..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit f0230ee38a5031d447758259245a5121ec7e4789 Merge: c5899d5cf ce8e7427b Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Add support for the coveralls.io coverage tool in travis config
commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc +- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 0..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Add support for the coveralls.io coverage tool in travis config
commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc +- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 0..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++- compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] heartbeat: Log the number of circuits killed because too many cells
commit 93ff1870ba153332ab695e53d906da6a14a8097c
Author: David Goulet
Date: Tue Apr 17 08:38:34 2018 -0400
heartbeat: Log the number of circuits killed because too many cells
We recently merged a circuit cell queue size safeguard. This commit adds the
number of killed circuits that have reached the limit to the DoS heartbeat.
It
now looks like this:
[notice] DoS mitigation since startup: 0 circuits killed with too many
cells. 0 circuits rejected, 0 marked addresses. 0 connections closed. 0
single hop clients refused.
Second thing that this patch does. It makes tor always print the DoS
mitigation heartbeat line (for a relay) even though no DoS mitigation have
been enabled. The reason is because we now kill circuits that have too many
cells regardless on if it is enabled or not but also it will give the
operator
a chance to learn what is enabled with the heartbeat instead of suddenly
appearing when it is enabled by let say the consensus.
Fixes #25824
Signed-off-by: David Goulet
---
src/or/dos.c | 15 +--
src/or/relay.c | 4
src/or/relay.h | 1 +
src/test/test_status.c | 12 +++-
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/or/dos.c b/src/or/dos.c
index 4d1797eec..2cb347058 100644
--- a/src/or/dos.c
+++ b/src/or/dos.c
@@ -15,6 +15,7 @@
#include "main.h"
#include "networkstatus.h"
#include "nodelist.h"
+#include "relay.h"
#include "router.h"
#include "dos.h"
@@ -622,10 +623,12 @@ dos_log_heartbeat(void)
char *conn_msg = NULL;
char *cc_msg = NULL;
char *single_hop_client_msg = NULL;
+ char *circ_stats_msg = NULL;
- if (!dos_is_enabled()) {
-goto end;
- }
+ /* Stats number coming from relay.c append_cell_to_circuit_queue(). */
+ tor_asprintf(&circ_stats_msg,
+ " %" PRIu64 " circuits killed with too many cells.",
+ stats_n_circ_max_cell_reached);
if (dos_cc_enabled) {
tor_asprintf(&cc_msg,
@@ -647,7 +650,8 @@ dos_log_heartbeat(void)
}
log_notice(LD_HEARTBEAT,
- "DoS mitigation since startup:%s%s%s",
+ "DoS mitigation since startup:%s%s%s%s",
+ circ_stats_msg,
(cc_msg != NULL) ? cc_msg : " [cc not enabled]",
(conn_msg != NULL) ? conn_msg : " [conn not enabled]",
(single_hop_client_msg != NULL) ? single_hop_client_msg : "");
@@ -655,8 +659,7 @@ dos_log_heartbeat(void)
tor_free(conn_msg);
tor_free(cc_msg);
tor_free(single_hop_client_msg);
-
- end:
+ tor_free(circ_stats_msg);
return;
}
diff --git a/src/or/relay.c b/src/or/relay.c
index 5a3c43e05..b3571d6cd 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -115,6 +115,9 @@ uint64_t stats_n_relay_cells_relayed = 0;
* hop?
*/
uint64_t stats_n_relay_cells_delivered = 0;
+/** Stats: how many circuits have we closed due to the cell queue limit being
+ * reached (see append_cell_to_circuit_queue()) */
+uint64_t stats_n_circ_max_cell_reached = 0;
/** Used to tell which stream to read from first on a circuit. */
static tor_weak_rng_t stream_choice_rng = TOR_WEAK_RNG_INIT;
@@ -3041,6 +3044,7 @@ append_cell_to_circuit_queue(circuit_t *circ, channel_t
*chan,
(exitward) ? "Outbound" : "Inbound", queue->n,
max_circuit_cell_queue_size);
circuit_mark_for_close(circ, END_CIRC_REASON_RESOURCELIMIT);
+stats_n_circ_max_cell_reached++;
return;
}
diff --git a/src/or/relay.h b/src/or/relay.h
index c9281c5ea..e96639170 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -14,6 +14,7 @@
extern uint64_t stats_n_relay_cells_relayed;
extern uint64_t stats_n_relay_cells_delivered;
+extern uint64_t stats_n_circ_max_cell_reached;
void relay_consensus_has_changed(const networkstatus_t *ns);
int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 50ea203e4..b4ca17891 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -340,7 +340,7 @@ NS(test_main)(void *arg)
actual = log_heartbeat(0);
tt_int_op(actual, OP_EQ, expected);
- tt_int_op(CALLED(logv), OP_EQ, 5);
+ tt_int_op(CALLED(logv), OP_EQ, 6);
done:
NS_UNMOCK(tls_get_write_overhead_ratio);
@@ -439,6 +439,16 @@ NS(logv)(int severity, log_domain_mask_t domain,
tt_ptr_op(strstr(funcname, "rep_hist_log_link_protocol_counts"),
OP_NE, NULL);
break;
+case 5:
+ tt_int_op(severity, OP_EQ, LOG_NOTICE);
+ tt_int_op(domain, OP_EQ, LD_HEARTBEAT);
+ tt_str_op(format, OP_EQ, "DoS mitigation since startup:%s%s%s%s");
+ tt_str_op(va_arg(ap, char *), OP_EQ,
+" 0 circuits killed with too many cells.");
+ tt_str_op(va_arg(ap, char *), OP_EQ, " [cc not enabled]");
+ tt_str_op(va_arg(ap, char *), OP_EQ, " [conn not enabled]");
+ tt_str_op(va_arg(ap, char *), OP_EQ, "");
+ break;
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
commit fb35918747493b518b62542899ed99cd8a3f0548 Merge: 6c4e10c93 93ff1870b Author: Nick Mathewson Date: Tue Apr 17 10:45:58 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/dos.c | 15 +-- src/or/relay.c | 4 src/or/relay.h | 1 + src/test/test_status.c | 12 +++- 4 files changed, 25 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/release-0.3.3] heartbeat: Log the number of circuits killed because too many cells
commit 93ff1870ba153332ab695e53d906da6a14a8097c
Author: David Goulet
Date: Tue Apr 17 08:38:34 2018 -0400
heartbeat: Log the number of circuits killed because too many cells
We recently merged a circuit cell queue size safeguard. This commit adds the
number of killed circuits that have reached the limit to the DoS heartbeat.
It
now looks like this:
[notice] DoS mitigation since startup: 0 circuits killed with too many
cells. 0 circuits rejected, 0 marked addresses. 0 connections closed. 0
single hop clients refused.
Second thing that this patch does. It makes tor always print the DoS
mitigation heartbeat line (for a relay) even though no DoS mitigation have
been enabled. The reason is because we now kill circuits that have too many
cells regardless on if it is enabled or not but also it will give the
operator
a chance to learn what is enabled with the heartbeat instead of suddenly
appearing when it is enabled by let say the consensus.
Fixes #25824
Signed-off-by: David Goulet
---
src/or/dos.c | 15 +--
src/or/relay.c | 4
src/or/relay.h | 1 +
src/test/test_status.c | 12 +++-
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/or/dos.c b/src/or/dos.c
index 4d1797eec..2cb347058 100644
--- a/src/or/dos.c
+++ b/src/or/dos.c
@@ -15,6 +15,7 @@
#include "main.h"
#include "networkstatus.h"
#include "nodelist.h"
+#include "relay.h"
#include "router.h"
#include "dos.h"
@@ -622,10 +623,12 @@ dos_log_heartbeat(void)
char *conn_msg = NULL;
char *cc_msg = NULL;
char *single_hop_client_msg = NULL;
+ char *circ_stats_msg = NULL;
- if (!dos_is_enabled()) {
-goto end;
- }
+ /* Stats number coming from relay.c append_cell_to_circuit_queue(). */
+ tor_asprintf(&circ_stats_msg,
+ " %" PRIu64 " circuits killed with too many cells.",
+ stats_n_circ_max_cell_reached);
if (dos_cc_enabled) {
tor_asprintf(&cc_msg,
@@ -647,7 +650,8 @@ dos_log_heartbeat(void)
}
log_notice(LD_HEARTBEAT,
- "DoS mitigation since startup:%s%s%s",
+ "DoS mitigation since startup:%s%s%s%s",
+ circ_stats_msg,
(cc_msg != NULL) ? cc_msg : " [cc not enabled]",
(conn_msg != NULL) ? conn_msg : " [conn not enabled]",
(single_hop_client_msg != NULL) ? single_hop_client_msg : "");
@@ -655,8 +659,7 @@ dos_log_heartbeat(void)
tor_free(conn_msg);
tor_free(cc_msg);
tor_free(single_hop_client_msg);
-
- end:
+ tor_free(circ_stats_msg);
return;
}
diff --git a/src/or/relay.c b/src/or/relay.c
index 5a3c43e05..b3571d6cd 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -115,6 +115,9 @@ uint64_t stats_n_relay_cells_relayed = 0;
* hop?
*/
uint64_t stats_n_relay_cells_delivered = 0;
+/** Stats: how many circuits have we closed due to the cell queue limit being
+ * reached (see append_cell_to_circuit_queue()) */
+uint64_t stats_n_circ_max_cell_reached = 0;
/** Used to tell which stream to read from first on a circuit. */
static tor_weak_rng_t stream_choice_rng = TOR_WEAK_RNG_INIT;
@@ -3041,6 +3044,7 @@ append_cell_to_circuit_queue(circuit_t *circ, channel_t
*chan,
(exitward) ? "Outbound" : "Inbound", queue->n,
max_circuit_cell_queue_size);
circuit_mark_for_close(circ, END_CIRC_REASON_RESOURCELIMIT);
+stats_n_circ_max_cell_reached++;
return;
}
diff --git a/src/or/relay.h b/src/or/relay.h
index c9281c5ea..e96639170 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -14,6 +14,7 @@
extern uint64_t stats_n_relay_cells_relayed;
extern uint64_t stats_n_relay_cells_delivered;
+extern uint64_t stats_n_circ_max_cell_reached;
void relay_consensus_has_changed(const networkstatus_t *ns);
int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 50ea203e4..b4ca17891 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -340,7 +340,7 @@ NS(test_main)(void *arg)
actual = log_heartbeat(0);
tt_int_op(actual, OP_EQ, expected);
- tt_int_op(CALLED(logv), OP_EQ, 5);
+ tt_int_op(CALLED(logv), OP_EQ, 6);
done:
NS_UNMOCK(tls_get_write_overhead_ratio);
@@ -439,6 +439,16 @@ NS(logv)(int severity, log_domain_mask_t domain,
tt_ptr_op(strstr(funcname, "rep_hist_log_link_protocol_counts"),
OP_NE, NULL);
break;
+case 5:
+ tt_int_op(severity, OP_EQ, LOG_NOTICE);
+ tt_int_op(domain, OP_EQ, LD_HEARTBEAT);
+ tt_str_op(format, OP_EQ, "DoS mitigation since startup:%s%s%s%s");
+ tt_str_op(va_arg(ap, char *), OP_EQ,
+" 0 circuits killed with too many cells.");
+ tt_str_op(va_arg(ap, char *), OP_EQ, " [cc not enabled]");
+ tt_str_op(va_arg(ap, char *), OP_EQ, " [conn not enabled]");
+ tt_str_op(va_arg(ap, char *), OP_EQ, "");
+ break;
[tor-commits] [tor/maint-0.3.3] heartbeat: Log the number of circuits killed because too many cells
commit 93ff1870ba153332ab695e53d906da6a14a8097c
Author: David Goulet
Date: Tue Apr 17 08:38:34 2018 -0400
heartbeat: Log the number of circuits killed because too many cells
We recently merged a circuit cell queue size safeguard. This commit adds the
number of killed circuits that have reached the limit to the DoS heartbeat.
It
now looks like this:
[notice] DoS mitigation since startup: 0 circuits killed with too many
cells. 0 circuits rejected, 0 marked addresses. 0 connections closed. 0
single hop clients refused.
Second thing that this patch does. It makes tor always print the DoS
mitigation heartbeat line (for a relay) even though no DoS mitigation have
been enabled. The reason is because we now kill circuits that have too many
cells regardless on if it is enabled or not but also it will give the
operator
a chance to learn what is enabled with the heartbeat instead of suddenly
appearing when it is enabled by let say the consensus.
Fixes #25824
Signed-off-by: David Goulet
---
src/or/dos.c | 15 +--
src/or/relay.c | 4
src/or/relay.h | 1 +
src/test/test_status.c | 12 +++-
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/or/dos.c b/src/or/dos.c
index 4d1797eec..2cb347058 100644
--- a/src/or/dos.c
+++ b/src/or/dos.c
@@ -15,6 +15,7 @@
#include "main.h"
#include "networkstatus.h"
#include "nodelist.h"
+#include "relay.h"
#include "router.h"
#include "dos.h"
@@ -622,10 +623,12 @@ dos_log_heartbeat(void)
char *conn_msg = NULL;
char *cc_msg = NULL;
char *single_hop_client_msg = NULL;
+ char *circ_stats_msg = NULL;
- if (!dos_is_enabled()) {
-goto end;
- }
+ /* Stats number coming from relay.c append_cell_to_circuit_queue(). */
+ tor_asprintf(&circ_stats_msg,
+ " %" PRIu64 " circuits killed with too many cells.",
+ stats_n_circ_max_cell_reached);
if (dos_cc_enabled) {
tor_asprintf(&cc_msg,
@@ -647,7 +650,8 @@ dos_log_heartbeat(void)
}
log_notice(LD_HEARTBEAT,
- "DoS mitigation since startup:%s%s%s",
+ "DoS mitigation since startup:%s%s%s%s",
+ circ_stats_msg,
(cc_msg != NULL) ? cc_msg : " [cc not enabled]",
(conn_msg != NULL) ? conn_msg : " [conn not enabled]",
(single_hop_client_msg != NULL) ? single_hop_client_msg : "");
@@ -655,8 +659,7 @@ dos_log_heartbeat(void)
tor_free(conn_msg);
tor_free(cc_msg);
tor_free(single_hop_client_msg);
-
- end:
+ tor_free(circ_stats_msg);
return;
}
diff --git a/src/or/relay.c b/src/or/relay.c
index 5a3c43e05..b3571d6cd 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -115,6 +115,9 @@ uint64_t stats_n_relay_cells_relayed = 0;
* hop?
*/
uint64_t stats_n_relay_cells_delivered = 0;
+/** Stats: how many circuits have we closed due to the cell queue limit being
+ * reached (see append_cell_to_circuit_queue()) */
+uint64_t stats_n_circ_max_cell_reached = 0;
/** Used to tell which stream to read from first on a circuit. */
static tor_weak_rng_t stream_choice_rng = TOR_WEAK_RNG_INIT;
@@ -3041,6 +3044,7 @@ append_cell_to_circuit_queue(circuit_t *circ, channel_t
*chan,
(exitward) ? "Outbound" : "Inbound", queue->n,
max_circuit_cell_queue_size);
circuit_mark_for_close(circ, END_CIRC_REASON_RESOURCELIMIT);
+stats_n_circ_max_cell_reached++;
return;
}
diff --git a/src/or/relay.h b/src/or/relay.h
index c9281c5ea..e96639170 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -14,6 +14,7 @@
extern uint64_t stats_n_relay_cells_relayed;
extern uint64_t stats_n_relay_cells_delivered;
+extern uint64_t stats_n_circ_max_cell_reached;
void relay_consensus_has_changed(const networkstatus_t *ns);
int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 50ea203e4..b4ca17891 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -340,7 +340,7 @@ NS(test_main)(void *arg)
actual = log_heartbeat(0);
tt_int_op(actual, OP_EQ, expected);
- tt_int_op(CALLED(logv), OP_EQ, 5);
+ tt_int_op(CALLED(logv), OP_EQ, 6);
done:
NS_UNMOCK(tls_get_write_overhead_ratio);
@@ -439,6 +439,16 @@ NS(logv)(int severity, log_domain_mask_t domain,
tt_ptr_op(strstr(funcname, "rep_hist_log_link_protocol_counts"),
OP_NE, NULL);
break;
+case 5:
+ tt_int_op(severity, OP_EQ, LOG_NOTICE);
+ tt_int_op(domain, OP_EQ, LD_HEARTBEAT);
+ tt_str_op(format, OP_EQ, "DoS mitigation since startup:%s%s%s%s");
+ tt_str_op(va_arg(ap, char *), OP_EQ,
+" 0 circuits killed with too many cells.");
+ tt_str_op(va_arg(ap, char *), OP_EQ, " [cc not enabled]");
+ tt_str_op(va_arg(ap, char *), OP_EQ, " [conn not enabled]");
+ tt_str_op(va_arg(ap, char *), OP_EQ, "");
+ break;
[tor-commits] [tor/master] Merge branch 'maint-0.3.3'
commit c5bbf72fb81eb8369178d61e990c14a9e631e419 Merge: c32108ee0 93ff1870b Author: Nick Mathewson Date: Tue Apr 17 10:45:58 2018 -0400 Merge branch 'maint-0.3.3' src/or/dos.c | 15 +-- src/or/relay.c | 4 src/or/relay.h | 1 + src/test/test_status.c | 12 +++- 4 files changed, 25 insertions(+), 7 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
commit c4754135d2c0742dff65ea4f40e5d53fb6ca18b2 Author: Translation commit bot Date: Tue Apr 17 13:18:13 2018 + Update translations for tails-openpgp-applet_completed --- ru/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index 386104417..b4248bac0 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: ta...@boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-04-12 19:13+\n" -"Last-Translator: Misha Dyachuk \n" +"PO-Revision-Date: 2018-04-17 13:15+\n" +"Last-Translator: e Translators \n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
commit ae51ef3b6fbcd022e7e31303299b86f458c4bc02 Author: Translation commit bot Date: Tue Apr 17 13:18:07 2018 + Update translations for tails-openpgp-applet --- ru/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index 386104417..b4248bac0 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: ta...@boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-04-12 19:13+\n" -"Last-Translator: Misha Dyachuk \n" +"PO-Revision-Date: 2018-04-17 13:15+\n" +"Last-Translator: e Translators \n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Prefer 32-bit implementation for timing wheels on 32-bit systems.
commit e0809ec5f5de4c3d22527425bf6253843044e1b2
Author: Nick Mathewson
Date: Mon Apr 9 15:21:10 2018 -0400
Prefer 32-bit implementation for timing wheels on 32-bit systems.
This might make our timing-wheel code a tiny bit faster there.
Closes ticket 24688.
---
changes/bug24688| 3 +++
src/common/timers.c | 5 +
2 files changed, 8 insertions(+)
diff --git a/changes/bug24688 b/changes/bug24688
new file mode 100644
index 0..c376fe6a0
--- /dev/null
+++ b/changes/bug24688
@@ -0,0 +1,3 @@
+ o Minor features (performance, 32-bit):
+- Make our timing-wheel code run a tiny bit faster on 32-bit platforms,
+ by preferring 32-bit math to 64-bit. Closes ticket 24688.
diff --git a/src/common/timers.c b/src/common/timers.c
index a90817da1..6f6236ed3 100644
--- a/src/common/timers.c
+++ b/src/common/timers.c
@@ -64,6 +64,11 @@ struct timeout_cb {
* above TIMEOUT_MAX can also be super-inefficient. Choosing 5 here sets
* timeout_max to 2^30 ticks, or 29 hours with our value for USEC_PER_TICK */
#define WHEEL_NUM 5
+#if SIZEOF_VOID_P == 4
+/* On 32-bit platforms, we want to override wheel_bit, so that timeout.c will
+ * use 32-bit math. */
+#define WHEEL_BIT 5
+#endif
#include "src/ext/timeouts/timeout.c"
static struct timeouts *global_timeouts = NULL;
___
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/bug24688'
commit c32108ee0fea851ced14f71d842390992f762393 Merge: ae4e5b982 e0809ec5f Author: Nick Mathewson Date: Tue Apr 17 09:14:44 2018 -0400 Merge remote-tracking branch 'public/bug24688' changes/bug24688| 3 +++ src/common/timers.c | 5 + 2 files changed, 8 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [onionoo/master] Stop excluding OR addresses from exit_addresses.
commit 5beef65a168e7bf74be9aa25b599380bf02052e1
Author: Karsten Loesing
Date: Tue Apr 3 17:10:27 2018 +0200
Stop excluding OR addresses from exit_addresses.
Fixes #25332.
---
CHANGELOG.md | 4
.../org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 6 +-
.../org/torproject/onionoo/writer/DetailsDocumentWriter.java | 9 +++--
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 692a417..b4efed7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changes in version 6.0-1.13.0 - 2018-04-??
+ * Medium changes
+ - Change the "exit_addresses" field to not exclude current OR
+ addresses anymore.
+
* Minor changes
- Turn valid utf-8 escape sequences into utf-8 characters.
diff --git
a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
index 6f9bdea..b34d2ef 100644
--- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
+++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
@@ -833,11 +833,7 @@ public class NodeDetailsStatusUpdater implements
DescriptorListener,
}
}
detailsStatus.setExitAddresses(exitAddresses);
- SortedSet exitAddressesWithoutOrAddresses =
- new TreeSet<>(exitAddresses.keySet());
- exitAddressesWithoutOrAddresses.removeAll(
- nodeStatus.getOrAddresses());
- nodeStatus.setExitAddresses(exitAddressesWithoutOrAddresses);
+ nodeStatus.setExitAddresses(new TreeSet<>(exitAddresses.keySet()));
detailsStatus.setAllegedFamily(nodeStatus.getAllegedFamily());
detailsStatus.setEffectiveFamily(nodeStatus.getEffectiveFamily());
diff --git
a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
index 4aace51..a335916 100644
--- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
+++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
@@ -143,12 +143,9 @@ public class DetailsDocumentWriter implements
DocumentWriter {
detailsStatus.getExitPolicyV6Summary());
detailsDocument.setHibernating(detailsStatus.getHibernating());
if (detailsStatus.getExitAddresses() != null) {
- SortedSet exitAddressesWithoutOrAddresses =
- new TreeSet<>(detailsStatus.getExitAddresses().keySet());
- exitAddressesWithoutOrAddresses.removeAll(
- detailsStatus.getOrAddresses());
- detailsDocument.setExitAddresses(new ArrayList<>(
- exitAddressesWithoutOrAddresses));
+ List exitAddresses = new ArrayList<>(new TreeSet<>(
+ detailsStatus.getExitAddresses().keySet()));
+ detailsDocument.setExitAddresses(exitAddresses);
}
detailsDocument.setMeasured(detailsStatus.getMeasured());
List unreachableOrAddresses = new ArrayList<>();
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup
commit 48dbcbe3c061e54a4cdb5ceb83fa0f0fd7bd82b0 Author: Translation commit bot Date: Tue Apr 17 08:45:49 2018 + Update translations for tails-persistence-setup --- om/om.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/om/om.po b/om/om.po index 6f115a125..483afa2da 100644 --- a/om/om.po +++ b/om/om.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2018-02-20 18:51+\n" -"Last-Translator: Ermias Tasfaye \n" +"PO-Revision-Date: 2018-04-17 08:22+\n" +"Last-Translator: Sinshaw Alemu \n" "Language-Team: Oromo (http://www.transifex.com/otf/torproject/language/om/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-miscellaneous_completed] Update translations for support-miscellaneous_completed
commit ae704cca1a435a352307e39f9aa56fb7dbe6b23b
Author: Translation commit bot
Date: Tue Apr 17 08:20:22 2018 +
Update translations for support-miscellaneous_completed
---
es.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/es.json b/es.json
index 8f48ce9f0..6bec37c61 100644
--- a/es.json
+++ b/es.json
@@ -2,8 +2,8 @@
"misc-1": {
"id": "#misc-1",
"control": "misc-1",
- "title": "Tengo una razón imperiosa para trazar a un usuario de Tor.
¿Me puede ayudar?",
- "description": "No hay nada que los desarrolladores
de Tor puedan hacer para trazar a los usuarios de Tor. Las mismas protecciones
que evitan que indeseables rompan el anonimato de Tor nos impiden a nosotros
rastrear usuarios."
+ "title": "Tengo una razón imperiosa para encontrar a un usuario de
Tor. ¿Me pueden ayudar?",
+ "description": "Los desarrolladores de Tor no pueden
encontrar a los usuarios de Tor. Las mismas protecciones que evitan que los
malos rompan el anonimato de Tor, nos impiden a nosotros mismos rastrear a los
usuarios."
},
"misc-2": {
"id": "#misc-2",
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-miscellaneous] Update translations for support-miscellaneous
commit d2da66ea81200b1b8a5639e866701177308b180a
Author: Translation commit bot
Date: Tue Apr 17 08:20:17 2018 +
Update translations for support-miscellaneous
---
es.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/es.json b/es.json
index 8f48ce9f0..6bec37c61 100644
--- a/es.json
+++ b/es.json
@@ -2,8 +2,8 @@
"misc-1": {
"id": "#misc-1",
"control": "misc-1",
- "title": "Tengo una razón imperiosa para trazar a un usuario de Tor.
¿Me puede ayudar?",
- "description": "No hay nada que los desarrolladores
de Tor puedan hacer para trazar a los usuarios de Tor. Las mismas protecciones
que evitan que indeseables rompan el anonimato de Tor nos impiden a nosotros
rastrear usuarios."
+ "title": "Tengo una razón imperiosa para encontrar a un usuario de
Tor. ¿Me pueden ayudar?",
+ "description": "Los desarrolladores de Tor no pueden
encontrar a los usuarios de Tor. Las mismas protecciones que evitan que los
malos rompan el anonimato de Tor, nos impiden a nosotros mismos rastrear a los
usuarios."
},
"misc-2": {
"id": "#misc-2",
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
