[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/49'
commit 139b5d05b038aec9ea2ba91b9fc371119a7e8fd1 Merge: f6b5881 7ab17fc Author: Nick Mathewson Date: Wed Jan 9 15:47:04 2019 -0500 Merge remote-tracking branch 'tor-github/pr/49' control-spec.txt | 3 --- 1 file changed, 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/627'
commit 2f0e187191216d6dc4a3527e7e3b2bf268d869c0 Merge: 578a93bbb dbf1725a1 Author: Nick Mathewson Date: Wed Jan 9 15:46:14 2019 -0500 Merge remote-tracking branch 'tor-github/pr/627' changes/ticket28757 | 5 + src/feature/control/control.c | 9 - 2 files changed, 5 insertions(+), 9 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Stop mentioning 'GETINFO status/version/num-{concurring, versioning}'
commit 7ab17fcb13403aac2663813490e8dfef04ffa743
Author: rl1987
Date: Thu Jan 3 10:40:11 2019 +0200
Stop mentioning 'GETINFO status/version/num-{concurring,versioning}'
---
control-spec.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/control-spec.txt b/control-spec.txt
index fb4cb3e..23db764 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -861,9 +861,6 @@
"status/version/current"
Status of the current version. One of: new, old, unrecommended,
recommended, new in series, obsolete, unknown.
-"status/version/num-concurring"
-"status/version/num-versioning"
- These options are deprecated; they no longer give useful information.
"status/clients-seen"
A summary of which countries we've seen clients from recently,
formatted the same as the CLIENTS_SEEN status event described in
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Completely remove 'GETINFO status/version/num-{concurring, versioning}'
commit dbf1725a135405cfa3e4aea9d66e0d62fed1f360
Author: rl1987
Date: Thu Jan 3 10:36:38 2019 +0200
Completely remove 'GETINFO status/version/num-{concurring,versioning}'
---
changes/ticket28757 | 5 +
src/feature/control/control.c | 9 -
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/changes/ticket28757 b/changes/ticket28757
new file mode 100644
index 0..62c6d099f
--- /dev/null
+++ b/changes/ticket28757
@@ -0,0 +1,5 @@
+ o Removed features:
+- Stop responding to 'GETINFO status/version/num-concurring' and
+ 'GETINFO status/version/num-versioning' control port commands, as those
+ were deprecated back in 0.2.0.30. Also stop listing them in output of
+ 'GETINFO info/names'. Resolves ticket 28757.
diff --git a/src/feature/control/control.c b/src/feature/control/control.c
index da62c9498..f10d5eb84 100644
--- a/src/feature/control/control.c
+++ b/src/feature/control/control.c
@@ -3069,11 +3069,6 @@ getinfo_helper_events(control_connection_t *control_conn,
case VS_UNKNOWN: *answer = tor_strdup("unknown"); break;
default: tor_fragile_assert();
}
- } else if (!strcmp(question, "status/version/num-versioning") ||
- !strcmp(question, "status/version/num-concurring")) {
-tor_asprintf(answer, "%d", get_n_authorities(V3_DIRINFO));
-log_warn(LD_GENERAL, "%s is deprecated; it no longer gives useful "
- "information", question);
}
} else if (!strcmp(question, "status/clients-seen")) {
char *bridge_stats = geoip_get_bridge_stats_controller(time(NULL));
@@ -3366,10 +3361,6 @@ static const getinfo_item_t getinfo_items[] = {
"A fresh relay/ei descriptor pair for Tor's current state. Not stored."),
DOC("status/version/recommended", "List of currently recommended versions."),
DOC("status/version/current", "Status of the current version."),
- DOC("status/version/num-versioning", "Number of versioning authorities."),
- DOC("status/version/num-concurring",
- "Number of versioning authorities agreeing on the status of the "
- "current version"),
ITEM("address", misc, "IP address of this Tor host, if we can guess it."),
ITEM("traffic/read", misc,"Bytes read since the process was started."),
ITEM("traffic/written", misc,
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/staging] Add some people to the people page
commit 24777287c26f05d8239ba00b79ff3d43f50da68d Author: hiro Date: Wed Jan 9 20:43:26 2019 +0100 Add some people to the people page --- content/about/people/agrabeli/contents.lr | 16 content/about/people/ailanthus/contents.lr| 13 + content/about/people/arma/contents.lr | 14 ++ content/about/people/boklm/contents.lr| 11 +++ content/about/people/catalyst/contents.lr | 16 content/about/people/egypcio/contents.lr | 13 + content/about/people/haxxpop/contents.lr | 13 + content/about/people/inf0/contents.lr | 14 ++ content/about/people/juga/contents.lr | 13 + content/about/people/julius-core/contents.lr | 11 +++ content/about/people/juris/contents.lr| 11 +++ content/about/people/karsten/contents.lr | 14 ++ content/about/people/kat/contents.lr | 13 + content/about/people/kushal/contents.lr | 17 + content/about/people/leif/contents.lr | 11 +++ content/about/people/ln5/contents.lr | 14 ++ content/about/people/matt-core/contents.lr| 14 ++ content/about/people/matt/contents.lr | 2 ++ content/about/people/mcs/contents.lr | 13 + content/about/people/meejah/contents.lr | 15 +++ content/about/people/micahflee/contents.lr| 16 content/about/people/moritz/contents.lr | 14 ++ content/about/people/mrphs/contents.lr| 14 ++ content/about/people/mtigas/contents.lr | 15 +++ content/about/people/n8fr8/contents.lr| 14 ++ content/about/people/nickm/contents.lr| 16 content/about/people/pari/contents.lr | 14 ++ content/about/people/pastly/contents.lr | 11 +++ content/about/people/pepijn/contents.lr | 13 + content/about/people/peter/contents.lr| 11 +++ content/about/people/phw/contents.lr | 16 content/about/people/pili/contents.lr | 15 +++ content/about/people/pospeselr/contents.lr| 13 + content/about/people/rabbi-rob-thomas/contents.lr | 11 +++ content/about/people/ramy-core/contents.lr| 13 + content/about/people/robgjansen/contents.lr | 15 +++ content/about/people/sajolida/contents.lr | 11 +++ content/about/people/sebastian/contents.lr| 12 content/about/people/sisbell/contents.lr | 15 +++ content/about/people/sjmurdoch/contents.lr| 17 + content/about/people/ssteele/contents.lr | 15 +++ content/about/people/sstevenson/contents.lr | 13 + content/about/people/stephw/contents.lr | 15 +++ content/about/people/sukhe/contents.lr| 13 + content/about/people/sysrqb/contents.lr | 13 + content/about/people/syverson/contents.lr | 12 content/about/people/t0mmy/contents.lr| 13 + content/about/people/teor/contents.lr | 14 ++ content/about/people/tjr/contents.lr | 16 content/about/people/wayward/contents.lr | 15 +++ content/about/people/wseltzer/contents.lr | 14 ++ content/about/people/yawningangel/contents.lr | 11 +++ i18n/contents.pot | 2 +- 53 files changed, 699 insertions(+), 1 deletion(-) diff --git a/content/about/people/agrabeli/contents.lr b/content/about/people/agrabeli/contents.lr new file mode 100644 index 000..c8cb762 --- /dev/null +++ b/content/about/people/agrabeli/contents.lr @@ -0,0 +1,16 @@ +_model: person +--- +role: core +--- +name: Maria Xynou +--- +nickname: agrabeli +--- +pronoun: she +--- +twitter_handle: agrabeli_ +--- +description: + +Maria manages OONI's Partnership Program and writes research reports on internet +censorship around the world. diff --git a/content/about/people/ailanthus/contents.lr b/content/about/people/ailanthus/contents.lr new file mode 100644 index 000..7a544c5 --- /dev/null +++ b/content/about/people/ailanthus/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +name: Kate Krauss +--- +nickname: ailanthus +--- +twitter_handle: aidspol +--- +description: + +Writes about Tor in mainstream and technical publications and conducts community workshops to teach people about Tor. diff --git a/content/about/people/arma/contents.lr b/content/about/people/arma/contents.lr new file mode
[tor-commits] [nyx/master] Notify when connection information is unavailable
commit e042022c117ad817d2ac8e974241c53d5c3448b9
Author: Damian Johnson
Date: Wed Jan 9 10:41:26 2019 -0800
Notify when connection information is unavailable
Provide a notice explaining why connection information is unavailable
when the user's system lacks /proc content. Ususally Mac and BSD users.
https://trac.torproject.org/projects/tor/ticket/24958
---
nyx/tracker.py | 9 -
web/changelog/index.html | 1 +
web/index.html | 21 +
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/nyx/tracker.py b/nyx/tracker.py
index b0ea9bb..f6880d2 100644
--- a/nyx/tracker.py
+++ b/nyx/tracker.py
@@ -510,13 +510,12 @@ class ConnectionTracker(Daemon):
# resolution. Otherwise connection resolution by inference is the only game
# in town.
-self._resolvers = []
+self._resolvers = [CustomResolver.INFERENCE] if
stem.util.proc.is_available() else []
if tor_controller().get_conf('DisableDebuggerAttachment', None) == '0':
- self._resolvers = connection.system_resolvers()
-
-if stem.util.proc.is_available():
- self._resolvers = [CustomResolver.INFERENCE] + self._resolvers
+ self._resolvers = self._resolvers + connection.system_resolvers()
+elif not self._resolvers:
+ stem.util.log.notice("Tor connection information is unavailable. This is
fine, but if you would like to have it please see
https://nyx.torproject.org/#no_connections;)
stem.util.log.info('Operating System: %s, Connection Resolvers: %s' %
(os.uname()[0], ', '.join(self._resolvers)))
diff --git a/web/changelog/index.html b/web/changelog/index.html
index 0ba98c2..d49533e 100644
--- a/web/changelog/index.html
+++ b/web/changelog/index.html
@@ -77,6 +77,7 @@
Blank debug path caused us to crash (https://trac.torproject.org/projects/tor/ticket/27350;>ticket)
Nyxrc password option for the controller credential (https://trac.torproject.org/projects/tor/ticket/28295;>ticket)
Accept shorthand '--interface' arugments with a colon but no
address (https://trac.torproject.org/projects/tor/ticket/28965;>ticket)
+Notification when connection information is unavailable (https://trac.torproject.org/projects/tor/ticket/24958;>ticket)
diff --git a/web/index.html b/web/index.html
index 0ec396e..2c2 100644
--- a/web/index.html
+++ b/web/index.html
@@ -280,6 +280,27 @@ E: Unable to locate package nyx
+
+ Why can't I see Tor's connections?
+
+Nyx can provide you with information about tor's active connections. This
information is retrieved from your system's /proc content or tools such
as netstat and lsof.
+
+Unfortunately Tor inadvertently breaks the tools Nyx falls back
to through a featurure called https://www.torproject.org/docs/tor-manual.html.en#DisableDebuggerAttachment;>DisableDebuggerAttachment,
which makes tor's process memory only readable by root.
+
+This leaves you with three options...
+
+
+ Use Nyx without connection data. Nyx does not require
connection information, and aside a sparse connection list you probably
won't even notice.
+ Run Nyx as root. This is not recommended.
+ Turn off https://www.torproject.org/docs/tor-manual.html.en#DisableDebuggerAttachment;>DisableDebuggerAttachment
by adding the following to your https://www.torproject.org/docs/faq.html.en#torrc;>torrc and
restarting tor...
+DisableDebuggerAttachment 0
+
+
+
+Don't fret overly much about this decision. Nothing at play
here is important - connection data is unimportant and
DisableDebuggerAttachment's https://trac.torproject.org/projects/tor/ticket/3313;>security
benefit is insignificant. Either decision is fine.
+
+
+
Why are connections missing relay details?
___
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 3a454fd46035bc7c0214b7154a71d6ae974cab9c Author: Translation commit bot Date: Wed Jan 9 17:45:37 2019 + Update translations for https_everywhere --- es/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index b2ea413d5..504990a04 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.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/https_everywhere_completed] Update translations for https_everywhere_completed
commit 1259c851df39fe8d317f437fba7942b77c9bcba9 Author: Translation commit bot Date: Wed Jan 9 17:45:43 2019 + Update translations for https_everywhere_completed --- es/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index c16c3a4f9..504990a04 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.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] [sbws/master] config: Use configuration provided as argument
commit 21ce9b69d7cf4275e5c8c290f2021495beb1e984
Author: juga0
Date: Fri Dec 7 17:31:03 2018 +
config: Use configuration provided as argument
Fixes bug #28724. Bugfix v0.7.0.
---
sbws/util/config.py| 7 +--
tests/unit/util/data/user_sbws.ini | 3 +++
tests/unit/util/test_config.py | 10 +-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/sbws/util/config.py b/sbws/util/config.py
index 1aaff53..22f7cbd 100644
--- a/sbws/util/config.py
+++ b/sbws/util/config.py
@@ -70,11 +70,14 @@ def _get_user_config(args, conf=None):
# sbws should start with a logger before reading configurations.
print('Configuration file %s not found, using defaults.' %
args.config)
-return conf
+return conf
+print('Using configuration provided as argument %s' % args.config)
+return _extend_config(conf, args.config)
user_config_path = _obtain_user_conf_path()
if os.path.isfile(user_config_path):
+print('Using configuration file %s' % user_config_path)
return _extend_config(conf, user_config_path)
-log.debug('No user config found.')
+log.debug('No user config found, using defaults.')
return conf
diff --git a/tests/unit/util/data/user_sbws.ini
b/tests/unit/util/data/user_sbws.ini
new file mode 100644
index 000..6dae60c
--- /dev/null
+++ b/tests/unit/util/data/user_sbws.ini
@@ -0,0 +1,3 @@
+[paths]
+
+sbws_home = /tmp/.sbws
\ No newline at end of file
diff --git a/tests/unit/util/test_config.py b/tests/unit/util/test_config.py
index e1ce169..95dde6f 100644
--- a/tests/unit/util/test_config.py
+++ b/tests/unit/util/test_config.py
@@ -237,4 +237,12 @@ def test_nickname():
def test_config_arg_provided_but_no_found(args, conf):
args.config = 'non_existing_file'
-con._get_user_config(args, conf=None)
+user_conf = con._get_user_config(args, conf)
+# since the user configuration is not found, it is the same as conf
+assert conf.__dict__.items() == user_conf.__dict__.items()
+
+
+def test_config_arg_provided(args, conf, datadir):
+args.config = datadir.join('user_sbws.ini')
+user_conf = con._get_user_config(args, conf)
+assert user_conf['paths']['sbws_home'] == '/tmp/.sbws'
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] Merge branch 'bug28724_01'
commit c38cf733e3b2d56f5a2022694c66469fdaeeef9d Merge: fcca7fa 21ce9b6 Author: juga0 Date: Wed Jan 9 17:36:19 2019 + Merge branch 'bug28724_01' sbws/util/config.py| 7 +-- tests/unit/util/data/user_sbws.ini | 3 +++ tests/unit/util/test_config.py | 10 +- 3 files changed, 17 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] stem: parse torrc options that are only a key
commit fcca7fafc3503b1a0796dd74d412658a89f94653
Author: juga0
Date: Fri Dec 7 09:37:20 2018 +
stem: parse torrc options that are only a key
User torrc options in `extra_lines` that are only one key and not
a key value pair were not being parsed correctly.
Add a test.
Fixes bug #28715. Bugfix v0.1.1
---
sbws/util/stem.py| 16
tests/unit/util/test_stem.py | 8
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index aa4fa69..d8e5cf8 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -134,15 +134,13 @@ def parse_user_torrc_config(torrc, torrc_text):
# Ignore blank lines
if len(line) < 1:
continue
-# The way stem handles configuring Tor with a dictionary is the first
-# word is a key and the remaining words are the value.
+# Some torrc options are only a key, some are a key value pair.
kv = line.split(None, 1)
-if len(kv) < 2:
-fail_hard('All torrc lines must have 2 or more words. "%s" has '
- 'fewer', line)
-key, value = kv
-log.debug('Adding "%s %s" to torrc with which we are launching Tor',
- key, value)
+if len(kv) > 1:
+key, value = kv
+else:
+key = kv[0]
+value = None
# It's really easy to add to the torrc if the key doesn't exist
if key not in torrc:
torrc_dict.update({key: value})
@@ -160,6 +158,8 @@ def parse_user_torrc_config(torrc, torrc_text):
assert isinstance(existing_val, list)
existing_val.append(value)
torrc_dict.update({key: existing_val})
+log.debug('Adding "%s %s" to torrc with which we are launching Tor',
+ key, value)
return torrc_dict
diff --git a/tests/unit/util/test_stem.py b/tests/unit/util/test_stem.py
index 8edf789..c2aafe9 100644
--- a/tests/unit/util/test_stem.py
+++ b/tests/unit/util/test_stem.py
@@ -24,3 +24,11 @@ def
test_parse_user_torrc_config_existing_keyvalue_options_fail(caplog):
# the existing value and the new value
assert torrc_dict_new != torrc_dict
assert torrc_dict_new == {'SocksPort': ['auto', '9050']}
+
+
+def test_parse_user_torrc_config_new_key_option_success():
+config_torrc_extra_lines = """
+LongLivedPorts
+"""
+torrc_dict = parse_user_torrc_config({}, config_torrc_extra_lines)
+assert torrc_dict == {'LongLivedPorts': None}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] stem: return a new Tor configuration dictionary
commit a44ff55d4d6adc8161ecaf3dc74989422ce06309
Author: juga0
Date: Thu Dec 6 18:28:41 2018 +
stem: return a new Tor configuration dictionary
when parsing user configuration, instead of modifying the one
passed to the function.
Fixes bug #28738. Bugfix v0.1.1
---
sbws/util/stem.py| 14 +++---
tests/unit/util/test_stem.py | 13 +
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index bd8f7d0..d2fa5d8 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -119,14 +119,15 @@ def _init_controller_socket(socket):
def parse_user_torrc_config(torrc, torrc_text):
"""Parse the user configuration torrc text call `extra_lines`
-to a dictionary suitable to use with stem and update the existing torrc.
+to a dictionary suitable to use with stem and return a new torrc
+dictionary that merges that dictionary with the existing torrc.
Example:
[tor]
extra_lines =
Log debug file /tmp/tor-debug.log
NumCPUs 1
"""
-
+torrc_dict = torrc.copy()
for line in torrc_text.split('\n'):
# Remove leading and trailing whitespace, if any
line = line.strip()
@@ -144,7 +145,7 @@ def parse_user_torrc_config(torrc, torrc_text):
key, value)
# It's really easy to add to the torrc if the key doesn't exist
if key not in torrc:
-torrc.update({key: value})
+torrc_dict.update({key: value})
# But if it does, we have to make a list of values. For example, say
# the user wants to add a SocksPort and we already have
# 'SocksPort auto' in the torrc. We'll go from
@@ -154,12 +155,12 @@ def parse_user_torrc_config(torrc, torrc_text):
else:
existing_val = torrc[key]
if isinstance(existing_val, str):
-torrc.update({key: [existing_val, value]})
+torrc_dict.update({key: [existing_val, value]})
else:
assert isinstance(existing_val, list)
existing_val.append(value)
-torrc.update({key: existing_val})
-return torrc
+torrc_dict.update({key: existing_val})
+return torrc_dict
def launch_tor(conf):
@@ -186,7 +187,6 @@ def launch_tor(conf):
})
torrc = parse_user_torrc_config(torrc, conf['tor']['extra_lines'])
-
# Finally launch Tor
try:
stem.process.launch_tor_with_config(
diff --git a/tests/unit/util/test_stem.py b/tests/unit/util/test_stem.py
index 888f2db..8edf789 100644
--- a/tests/unit/util/test_stem.py
+++ b/tests/unit/util/test_stem.py
@@ -11,3 +11,16 @@ def
test_parse_user_torrc_config_new_keyvalue_options_success():
torrc_dict = parse_user_torrc_config({}, config_torrc_extra_lines)
assert torrc_dict == \
{'Log': 'debug file /tmp/tor-debug.log', 'NumCPUs': '1'}
+
+
+def test_parse_user_torrc_config_existing_keyvalue_options_fail(caplog):
+torrc_dict = {'SocksPort': 'auto'}
+config_torrc_extra_lines = """
+SocksPort 9050
+"""
+torrc_dict_new = parse_user_torrc_config(
+torrc_dict, config_torrc_extra_lines)
+# the new dictionary contains the existing key option and a list with both
+# the existing value and the new value
+assert torrc_dict_new != torrc_dict
+assert torrc_dict_new == {'SocksPort': ['auto', '9050']}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] Merge branch 'bug28738'
commit 405b56a4ff4f286e37be36124a69105b60b08a9d Merge: c0f76f2 830ef6b Author: juga0 Date: Wed Jan 9 17:11:10 2019 + Merge branch 'bug28738' sbws/util/stem.py| 89 ++-- tests/unit/util/test_stem.py | 26 + 2 files changed, 70 insertions(+), 45 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] stem: lower log level when parsing Tor options
commit 830ef6b68c19e690a8015ba408eaea9b7cca0a8d
Author: juga0
Date: Thu Dec 6 19:59:08 2018 +
stem: lower log level when parsing Tor options
---
sbws/util/stem.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index d2fa5d8..aa4fa69 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -141,8 +141,8 @@ def parse_user_torrc_config(torrc, torrc_text):
fail_hard('All torrc lines must have 2 or more words. "%s" has '
'fewer', line)
key, value = kv
-log.info('Adding "%s %s" to torrc with which we are launching Tor',
- key, value)
+log.debug('Adding "%s %s" to torrc with which we are launching Tor',
+ key, value)
# It's really easy to add to the torrc if the key doesn't exist
if key not in torrc:
torrc_dict.update({key: value})
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] stem: refactor, move to a function parsing torrc
commit be62703ac02db8480eb2dd1dfaefb823f6c40fd7
Author: juga0
Date: Thu Dec 6 18:15:16 2018 +
stem: refactor, move to a function parsing torrc
launch_tor is also parsing three sources of torrc options.
Move the `extra_lines` torrc option set by a user configuration
file to a function so that it can be tested.
Add docstring and remove comments.
Add sucess test.
Fixes bug #28738. Bugfix v0.1.1
---
sbws/util/stem.py| 77 ++--
tests/unit/util/test_stem.py | 13
2 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index c3fffd1..bd8f7d0 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -117,44 +117,17 @@ def _init_controller_socket(socket):
return c
-def launch_tor(conf):
-assert isinstance(conf, ConfigParser)
-os.makedirs(conf.getpath('tor', 'datadir'), mode=0o700, exist_ok=True)
-os.makedirs(conf.getpath('tor', 'log'), exist_ok=True)
-os.makedirs(conf.getpath('tor', 'run_dpath'), mode=0o700, exist_ok=True)
-# Bare minimum things, more or less
-torrc = copy.deepcopy(TORRC_STARTING_POINT)
-# Very important and/or common settings that we don't know until runtime
-torrc.update({
-'DataDirectory': conf.getpath('tor', 'datadir'),
-'PidFile': conf.getpath('tor', 'pid'),
-'ControlSocket': conf.getpath('tor', 'control_socket'),
-'Log': [
-'NOTICE file {}'.format(os.path.join(conf.getpath('tor', 'log'),
- 'notice.log')),
-],
-# Things needed to make circuits fail a little faster. We get the
-# circuit_timeout as a string instead of an int on purpose: stem only
-# accepts strings.
-'LearnCircuitBuildTimeout': '0',
-'CircuitBuildTimeout': conf['general']['circuit_timeout'],
-})
-# This block of code reads additional torrc lines from the user's
-# config.ini so they can add arbitrary additional options.
-#
-# The user can't replace our options, only add to them. For example,
-# there's no way to remove 'SocksPort auto' (if it is still in
-# TORRC_STARTING_POINT). If you add a SocksPort in your config.ini, you'll
-# open two socks ports.
-#
-# As an example, maybe the user hates their HDD and wants to fill it with
-# debug logs, and wants to tell Tor to use only 1 CPU core.
-#
-# [tor]
-# extra_lines =
-# Log debug file /tmp/tor-debug.log
-# NumCPUs 1
-for line in conf['tor']['extra_lines'].split('\n'):
+def parse_user_torrc_config(torrc, torrc_text):
+"""Parse the user configuration torrc text call `extra_lines`
+to a dictionary suitable to use with stem and update the existing torrc.
+Example:
+[tor]
+extra_lines =
+Log debug file /tmp/tor-debug.log
+NumCPUs 1
+"""
+
+for line in torrc_text.split('\n'):
# Remove leading and trailing whitespace, if any
line = line.strip()
# Ignore blank lines
@@ -186,6 +159,34 @@ def launch_tor(conf):
assert isinstance(existing_val, list)
existing_val.append(value)
torrc.update({key: existing_val})
+return torrc
+
+
+def launch_tor(conf):
+assert isinstance(conf, ConfigParser)
+os.makedirs(conf.getpath('tor', 'datadir'), mode=0o700, exist_ok=True)
+os.makedirs(conf.getpath('tor', 'log'), exist_ok=True)
+os.makedirs(conf.getpath('tor', 'run_dpath'), mode=0o700, exist_ok=True)
+# Bare minimum things, more or less
+torrc = copy.deepcopy(TORRC_STARTING_POINT)
+# Very important and/or common settings that we don't know until runtime
+torrc.update({
+'DataDirectory': conf.getpath('tor', 'datadir'),
+'PidFile': conf.getpath('tor', 'pid'),
+'ControlSocket': conf.getpath('tor', 'control_socket'),
+'Log': [
+'NOTICE file {}'.format(os.path.join(conf.getpath('tor', 'log'),
+ 'notice.log')),
+],
+# Things needed to make circuits fail a little faster. We get the
+# circuit_timeout as a string instead of an int on purpose: stem only
+# accepts strings.
+'LearnCircuitBuildTimeout': '0',
+'CircuitBuildTimeout': conf['general']['circuit_timeout'],
+})
+
+torrc = parse_user_torrc_config(torrc, conf['tor']['extra_lines'])
+
# Finally launch Tor
try:
stem.process.launch_tor_with_config(
diff --git a/tests/unit/util/test_stem.py b/tests/unit/util/test_stem.py
new file mode 100644
index 000..888f2db
--- /dev/null
+++ b/tests/unit/util/test_stem.py
@@ -0,0 +1,13 @@
+"""Unit tests for stem.py"""
+
+from sbws.util.stem import parse_user_torrc_config
+
+
+def test_parse_user_torrc_config_new_keyvalue_options_success():
+
[tor-commits] [tpo/staging] Add some people to the people page
commit ef850a9203eb109f758e92083ef93c3189107b66 Author: hiro Date: Wed Jan 9 18:06:30 2019 +0100 Add some people to the people page --- content/about/people/asn/contents.lr | 11 +++ content/about/people/atagar/contents.lr | 13 + content/about/people/biella-core/contents.lr | 13 + content/about/people/brade/contents.lr| 11 +++ content/about/people/cindy-core/contents.lr | 15 +++ content/about/people/dawuud/contents.lr | 14 ++ content/about/people/dgoulet/contents.lr | 11 +++ content/about/people/donnchac/contents.lr | 13 + content/about/people/emmapeel/contents.lr | 13 + content/about/people/ewyatt/contents.lr | 12 content/about/people/gaba/contents.lr | 13 + content/about/people/geko/contents.lr | 11 +++ content/about/people/ggus/contents.lr | 11 +++ content/about/people/gman999/contents.lr | 11 +++ content/about/people/hc/contents.lr | 14 ++ content/about/people/iangoldberg/contents.lr | 14 ++ content/about/people/igt0/contents.lr | 13 + content/about/people/intrigeri/contents.lr| 13 + content/about/people/irl/contents.lr | 16 content/about/people/isabela/contents.lr | 13 + content/about/people/isra/contents.lr | 11 +++ content/about/people/jselon/contents.lr | 11 +++ content/about/people/komlo/contents.lr| 13 + content/about/people/nyinz/contents.lr| 12 content/about/people/phoul/contents.lr| 14 ++ content/about/people/qbi/contents.lr | 13 + content/about/people/redshiftzero/contents.lr | 14 ++ content/about/people/saint/contents.lr| 15 +++ i18n/contents.pot | 2 +- 29 files changed, 359 insertions(+), 1 deletion(-) diff --git a/content/about/people/asn/contents.lr b/content/about/people/asn/contents.lr new file mode 100644 index 000..05a23f3 --- /dev/null +++ b/content/about/people/asn/contents.lr @@ -0,0 +1,11 @@ +_model: person +--- +role: core +--- +name: George Kadianakis +--- +nickname: asn +--- +description: + +Onion services. Security analysis. Used to obfsproxy. Follower of the onion. diff --git a/content/about/people/atagar/contents.lr b/content/about/people/atagar/contents.lr new file mode 100644 index 000..fe510ed --- /dev/null +++ b/content/about/people/atagar/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +name: Damian Johnson +--- +nickname: atagar +--- +pronoun: he +--- +description: + +Author of the Stem python controller library and Nyx relay monitor. diff --git a/content/about/people/biella-core/contents.lr b/content/about/people/biella-core/contents.lr new file mode 100644 index 000..e09b90e --- /dev/null +++ b/content/about/people/biella-core/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +name: Gabriella Coleman +--- +nickname: biella +--- +twitter_handle: BiellaColeman +--- +description: + +[Anthropologist](http://gabriellacoleman.org/) and Wolfe Chair in Scientific and Technological Literacy at McGill University. diff --git a/content/about/people/brade/contents.lr b/content/about/people/brade/contents.lr new file mode 100644 index 000..d52ff12 --- /dev/null +++ b/content/about/people/brade/contents.lr @@ -0,0 +1,11 @@ +_model: person +--- +role: core +--- +name: Brade +--- +nickname: brade +--- +description: + +Developer on the Tor Browser team. diff --git a/content/about/people/cindy-core/contents.lr b/content/about/people/cindy-core/contents.lr new file mode 100644 index 000..854d4a2 --- /dev/null +++ b/content/about/people/cindy-core/contents.lr @@ -0,0 +1,15 @@ +_model: person +--- +role: core +--- +name: Cindy Cohn +--- +nickname: cindy +--- +pronoun: she +--- +description: + +Tor Board member and [Executive Director of the EFF](https://www.eff.org/about/staff/cindy-cohn). +Lawyer by training, her [focus](https://blog.torproject.org/blog/tor-heart-notes-board-member) + is on making sure Tor stays available and that Tor users stay safe. diff --git a/content/about/people/dawuud/contents.lr b/content/about/people/dawuud/contents.lr new file mode 100644 index 000..d11533e --- /dev/null +++ b/content/about/people/dawuud/contents.lr @@ -0,0 +1,14 @@ +_model: person +--- +role: core +--- +name: David Stainton +--- +nickname: dawuud +--- +twitter_handle: david415 +--- +description: + +[Author of roflcoptor and honeybadger](https://github.com/david415/). Researches +mixnets and contributes to txtorcon. diff --git a/content/about/people/dgoulet/contents.lr b/content/about/people/dgoulet/contents.lr new file mode 100644 index 000..59dab07 --- /dev/null +++
[tor-commits] [sbws/master] config: change default logging levels and formats
commit 8cd30a308bd2ad8481e5cc5b09dc15bd7462f1ff
Author: juga0
Date: Sat Dec 8 18:17:00 2018 +
config: change default logging levels and formats
And document that when sbws is launched by systemd the stdandard
output will go to journal and syslog.
Set default level to debug when logging to file and a more
verbose format.
Operators don't usually want to see the debug log in the stdout
or syslog, but they can see it in the file.
---
sbws/config.default.ini | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sbws/config.default.ini b/sbws/config.default.ini
index 8abee3d..a2a929f 100644
--- a/sbws/config.default.ini
+++ b/sbws/config.default.ini
@@ -94,10 +94,12 @@ min_relays = 50
[logging]
# Whether or not to log to a rotating file the directory paths.log_dname
-to_file = no
+to_file = yes
# Whether or not to log to stdout
to_stdout = yes
# Whether or not to log to syslog
+# NOTE that when sbws is launched by systemd, stdout goes to journal and
+# syslog.
to_syslog = no
# If logging to file, how large (in bytes) should the file be allowed to get
# before rotating to a new one. 10485760 is 10 MiB. If zero or number of
@@ -108,13 +110,13 @@ to_file_max_bytes = 10485760
to_file_num_backups = 50
# Level to log at. Debug, info, warning, error, critical.
level = info
-to_file_level = ${level}
+to_file_level = debug
to_stdout_level = ${level}
to_syslog_level = ${level}
# Format string to use when logging
format = [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s
-to_file_format = ${format}
+# verbose formatter useful for debugging
+to_file_format = %(asctime)s %(levelname)s %(threadName)s
%(filename)s:%(lineno)s - %(funcName)s - %(message)s
to_stdout_format = ${format}
to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
-# verbose formatter useful for debugging
-#format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s -
%(funcName)s - %(message)s
+
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] docs: add note about syslog when running systemd
commit 0632a25023927bb5711f3554159394f2daebafb2
Author: juga0
Date: Sat Dec 8 18:21:09 2018 +
docs: add note about syslog when running systemd
Closes bug #28761. Bugfix v0.6.0
---
docs/source/examples/sbws.example.ini | 15 +--
docs/source/man_sbws.ini.rst | 2 ++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/docs/source/examples/sbws.example.ini
b/docs/source/examples/sbws.example.ini
index 7155e66..cf6ff79 100644
--- a/docs/source/examples/sbws.example.ini
+++ b/docs/source/examples/sbws.example.ini
@@ -16,7 +16,7 @@ url = https://example.com/does/not/exist.bin
## There is no need to change them unless other options are prefered.
; [logging]
; # Whether or not to log to a rotating file the directory paths.log_dname
-; to_file = no
+; to_file = yes
; # Whether or not to log to stdout
; to_stdout = yes
; # Whether or not to log to syslog
@@ -25,13 +25,16 @@ url = https://example.com/does/not/exist.bin
; to_syslog = no
; # Level to log at. Debug, info, warning, error, critical.
-; level = info
+; # `level` must be set to the lower of all the handler levels.
+; level = debug
; to_file_level = debug
-; to_stdout_level = ${level}
-; to_syslog_level = ${level}
+; to_stdout_level = info
+; to_syslog_level = info
; # Format string to use when logging
-; format = [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s
+; format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
; # verbose formatter useful for debugging
; to_file_format = %(asctime)s %(levelname)s %(threadName)s
%(filename)s:%(lineno)s - %(funcName)s - %(message)s
+; # Not adding %(asctime)s to to stdout since it'll go to syslog when using
+; # systemd, and it'll have already the date.
; to_stdout_format = ${format}
-; to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
\ No newline at end of file
+; to_syslog_format = ${format}
\ No newline at end of file
diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst
index 0ea98b5..4ec7efb 100644
--- a/docs/source/man_sbws.ini.rst
+++ b/docs/source/man_sbws.ini.rst
@@ -139,6 +139,8 @@ logging
Whether or not to log to stdout. (Default: yes)
to_syslog = {yes, no}
Whether or not to log to syslog. (Default: no)
+NOTE that when sbws is launched by systemd, stdout goes to journal and
+syslog.
to_file_max_bytes = INT
If logging to file, how large (in bytes) should the file be allowed to get
before rotating to a new one. 10485760 is 10 MiB. If zero or number of
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] Merge branch 'bug28761'
commit c0f76f21553ef0f5734cf5b9885ef8c883cc0eeb
Merge: cd61cb3 0632a25
Author: juga0
Date: Wed Jan 9 16:59:01 2019 +
Merge branch 'bug28761'
docs/source/examples/sbws.example.ini | 28
docs/source/man_sbws.ini.rst | 2 ++
sbws/config.default.ini | 17 ++---
3 files changed, 40 insertions(+), 7 deletions(-)
diff --cc sbws/config.default.ini
index be8660b,d7c7b79..f40
--- a/sbws/config.default.ini
+++ b/sbws/config.default.ini
@@@ -107,14 -109,17 +109,15 @@@ to_file_max_bytes = 1048576
# never rotate the log file.
to_file_num_backups = 50
# Level to log at. Debug, info, warning, error, critical.
- level = info
- to_file_level = ${level}
- to_stdout_level = ${level}
- to_syslog_level = ${level}
+ # `level` must be set to the lower of all the handler levels.
+ level = debug
+ to_file_level = debug
+ to_stdout_level = info
+ to_syslog_level = info
# Format string to use when logging
-format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
+format = %(asctime)s %(module)s[%(process)s]: <%(levelname)s> %(message)s
- to_file_format = ${format}
+to_stdout_format = ${format}
+to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
# verbose formatter useful for debugging
- #format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s -
%(funcName)s - %(message)s
+ to_file_format = %(asctime)s %(levelname)s %(threadName)s
%(filename)s:%(lineno)s - %(funcName)s - %(message)s
-# Not adding %(asctime)s to to stdout since it'll go to syslog when using
-# systemd, and it'll have already the date.
-to_stdout_format = ${format}
-to_syslog_format = ${format}
+
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] docs: add logging examples to example configuration
commit 88a0ef0417cf348edb2e95e96794e719b8a946b3
Author: juga0
Date: Sat Dec 8 18:19:09 2018 +
docs: add logging examples to example configuration
---
docs/source/examples/sbws.example.ini | 25 +
sbws/config.default.ini | 13 -
2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/docs/source/examples/sbws.example.ini
b/docs/source/examples/sbws.example.ini
index 0130bdb..7155e66 100644
--- a/docs/source/examples/sbws.example.ini
+++ b/docs/source/examples/sbws.example.ini
@@ -10,3 +10,28 @@ foo = on
[destinations.foo]
# the domain and path to the 1GB file.
url = https://example.com/does/not/exist.bin
+
+
+## The following logging options are set by default.
+## There is no need to change them unless other options are prefered.
+; [logging]
+; # Whether or not to log to a rotating file the directory paths.log_dname
+; to_file = no
+; # Whether or not to log to stdout
+; to_stdout = yes
+; # Whether or not to log to syslog
+; # NOTE that when sbws is launched by systemd, stdout goes to journal and
+; # syslog.
+; to_syslog = no
+
+; # Level to log at. Debug, info, warning, error, critical.
+; level = info
+; to_file_level = debug
+; to_stdout_level = ${level}
+; to_syslog_level = ${level}
+; # Format string to use when logging
+; format = [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s
+; # verbose formatter useful for debugging
+; to_file_format = %(asctime)s %(levelname)s %(threadName)s
%(filename)s:%(lineno)s - %(funcName)s - %(message)s
+; to_stdout_format = ${format}
+; to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
\ No newline at end of file
diff --git a/sbws/config.default.ini b/sbws/config.default.ini
index a2a929f..d7c7b79 100644
--- a/sbws/config.default.ini
+++ b/sbws/config.default.ini
@@ -109,14 +109,17 @@ to_file_max_bytes = 10485760
# never rotate the log file.
to_file_num_backups = 50
# Level to log at. Debug, info, warning, error, critical.
-level = info
+# `level` must be set to the lower of all the handler levels.
+level = debug
to_file_level = debug
-to_stdout_level = ${level}
-to_syslog_level = ${level}
+to_stdout_level = info
+to_syslog_level = info
# Format string to use when logging
-format = [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s
+format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
# verbose formatter useful for debugging
to_file_format = %(asctime)s %(levelname)s %(threadName)s
%(filename)s:%(lineno)s - %(funcName)s - %(message)s
+# Not adding %(asctime)s to to stdout since it'll go to syslog when using
+# systemd, and it'll have already the date.
to_stdout_format = ${format}
-to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
+to_syslog_format = ${format}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/staging] Add some people to the people page
commit 60dcba405a4601e0288e5af4c1a8f362b2f36c0c Author: hiro Date: Wed Jan 9 17:08:17 2019 +0100 Add some people to the people page --- content/about/contents+es.lr | 3 + content/about/history/contents+es.lr | 15 +++ content/about/jobs/contents+es.lr| 1 + content/about/people/ahf/contents.lr | 15 +++ content/about/people/alsmith/contents.lr | 13 ++ content/about/people/amoghbl1/contents.lr| 13 ++ content/about/people/andreas/contents.lr | 12 ++ content/about/people/antonela/contents.lr| 13 ++ content/about/people/arlolra/contents.lr | 13 ++ content/about/people/arthuredelstein/contents.lr | 11 ++ content/about/people/bdavila/contents.lr | 13 ++ content/about/people/biella/contents.lr | 23 content/about/people/cindy/contents.lr | 23 content/about/people/contents+en.lr | 2 + content/about/people/contents+es.lr | 2 + content/about/people/contents+fr.lr | 2 + content/about/people/contents.lr | 2 + content/about/people/flexlibris/contents.lr | 17 +++ content/about/people/gunner/contents.lr | 15 +++ content/about/people/hellais/contents.lr | 15 +++ content/about/people/hiro/contents.lr| 13 ++ content/about/people/julius/contents.lr | 19 +++ content/about/people/matt/contents.lr| 16 +++ content/about/people/megan/contents.lr | 23 content/about/people/nighat/contents.lr | 22 content/about/people/ohmygodel/contents.lr | 13 ++ content/about/people/ramy/contents.lr| 29 + i18n/contents+en.po | 4 +- i18n/contents+es.po | 4 +- i18n/contents+fr.po | 4 +- i18n/contents.pot| 4 +- models/people.ini| 28 models/person.ini| 37 ++ templates/macros/people.html | 20 +++ templates/pagenav.html | 2 +- templates/people.html| 157 ++- templates/person.html| 1 + 37 files changed, 463 insertions(+), 156 deletions(-) diff --git a/content/about/contents+es.lr b/content/about/contents+es.lr index 0d6c58f..de7aa12 100644 --- a/content/about/contents+es.lr +++ b/content/about/contents+es.lr @@ -8,3 +8,6 @@ title: history --- body: +The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of âonion routingâ began in the mid 1990s. + +Just like Tor users, the developers, researchers, and funders whoâve made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web. diff --git a/content/about/history/contents+es.lr b/content/about/history/contents+es.lr index b83f99c..147dbb2 100644 --- a/content/about/history/contents+es.lr +++ b/content/about/history/contents+es.lr @@ -14,3 +14,18 @@ In the 1990s, the lack of security on the internet and its ability to be used fo The goal of onion routing was to have a way to use the internet with as much privacy as possible, and the idea was to route traffic through multiple servers and encrypt it each step of the way. This is still a simple explanation for how Tor works today. +In 2001, Roger Dingledine, then a student at MIT, adapted code from an undergraduate Cambridge studentâs thesis and began referring to the project as Tor, which stood for The Onion Router. Nick Mathewson, also a student at MIT, became involved in Torâs development around this time, too. + +In October 2003, Tor network was deployed, and Tor code was released under a free and open MIT license. In order for Tor to work optimally, everyone involved realized that not only does the Tor network need to be decentralized, it should also be maintained by a transparently operating entity with clear separation from its then stakeholders, and it needed to be free and open licensed. By the end of 2003, the network has about a dozen volunteer nodes, mostly in the US, plus one in Germany. + +Recognizing the benefit of Tor to digital rights, EFF became a fiscal sponsor of Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit organization, was founded to maintain Torâs development. + +In 2007, the organization began developing bridges to the Tor network to address censorship, such as the need to get around government firewalls, in order for its users to access the open web. + +Tor began gaining popularity among activists and tech-savvy users interested in privacy, but it was still difficult for less-technically savvy people to use, so in 2009-2010,
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit d6786f2cd63d4789a2f52e1feb2ff674a2f397b7 Author: Translation commit bot Date: Wed Jan 9 15:15:47 2019 + Update translations for https_everywhere_completed --- eo/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd index bae0598c7..aed9455bc 100644 --- a/eo/https-everywhere.dtd +++ b/eo/https-everywhere.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/https_everywhere] Update translations for https_everywhere
commit f5b2805a9888674d0719e96522cd231c92395490 Author: Translation commit bot Date: Wed Jan 9 15:15:41 2019 + Update translations for https_everywhere --- eo/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd index 0791bf85c..aed9455bc 100644 --- a/eo/https-everywhere.dtd +++ b/eo/https-everywhere.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] [torspec/master] Add DROPOWNERSHIP command
commit 1680b2e17e5f385923f9521c0f961ade45b76b4d Author: Damian Johnson Date: Fri Dec 14 11:18:10 2018 -0800 Add DROPOWNERSHIP command New command added courtesy of Nick (thanks Nick!). https://trac.torproject.org/projects/tor/ticket/28843 --- control-spec.txt | 18 ++ 1 file changed, 18 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index ae4a417..cdfd7c5 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1801,6 +1801,24 @@ [HSPOST was added in Tor 0.2.7.1-alpha] +3.23. DROPOWNERSHIP + + The syntax is: +"DROPOWNERSHIP" CRLF + + This command instructs Tor to relinquish ownership of its control + connection. As such tor will not shut down when this control + connection is closed. + + This method is idempotent. If the control connection does not + already have ownership this method returns successfully, and + does nothing. + + The controller can call TAKEOWNERSHIP again to re-establish + ownership. + + [DROPOWNERSHIP was added in Tor 0.4.0.0-alpha] + 4. Replies Reply codes follow the same 3-character format as used by SMTP, with the ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Merge remote-tracking branch 'atagar/dropownership'
commit f6b588161e9a59740b111b4db4d642b126e1b995 Merge: ecbde01 1680b2e Author: Nick Mathewson Date: Wed Jan 9 09:50:03 2019 -0500 Merge remote-tracking branch 'atagar/dropownership' control-spec.txt | 18 ++ 1 file changed, 18 insertions(+) ___ 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 DROPOWNERSHIP controller command to undo TAKEOWNERSHIP.
commit 4bc3983f64ab2a60a79127f47573836373ddf587
Author: Nick Mathewson
Date: Thu Dec 13 19:35:02 2018 -0500
Add a DROPOWNERSHIP controller command to undo TAKEOWNERSHIP.
Closes ticket 28843.
---
changes/ticket28843 | 3 +++
src/feature/control/control.c | 23 +++
2 files changed, 26 insertions(+)
diff --git a/changes/ticket28843 b/changes/ticket28843
new file mode 100644
index 0..00905293c
--- /dev/null
+++ b/changes/ticket28843
@@ -0,0 +1,3 @@
+ o Minor features (controller):
+- Add a DROPOWNERSHIP command to undo the effects of TAKEOWNERSHIP.
+ Implements ticket 28843.
diff --git a/src/feature/control/control.c b/src/feature/control/control.c
index c2da7fe48..50f43c0f4 100644
--- a/src/feature/control/control.c
+++ b/src/feature/control/control.c
@@ -1741,6 +1741,26 @@ handle_control_takeownership(control_connection_t *conn,
uint32_t len,
return 0;
}
+/** Called when we get a DROPOWNERSHIP command. Mark this connection
+ * as a non-owning connection, so that we will not exit if the connection
+ * closes. */
+static int
+handle_control_dropownership(control_connection_t *conn, uint32_t len,
+ const char *body)
+{
+ (void)len;
+ (void)body;
+
+ conn->is_owning_control_connection = 0;
+
+ log_info(LD_CONTROL, "Control connection %d has dropped ownership of this "
+ "Tor instance.",
+ (int)(conn->base_.s));
+
+ send_control_done(conn);
+ return 0;
+}
+
/** Return true iff addr is unusable as a mapaddress target because of
* containing funny characters. */
static int
@@ -5548,6 +5568,9 @@ connection_control_process_inbuf(control_connection_t
*conn)
} else if (!strcasecmp(conn->incoming_cmd, "TAKEOWNERSHIP")) {
if (handle_control_takeownership(conn, cmd_data_len, args))
return -1;
+ } else if (!strcasecmp(conn->incoming_cmd, "DROPOWNERSHIP")) {
+if (handle_control_dropownership(conn, cmd_data_len, args))
+ return -1;
} else if (!strcasecmp(conn->incoming_cmd, "MAPADDRESS")) {
if (handle_control_mapaddress(conn, cmd_data_len, args))
return -1;
___
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 'ticket28843'
commit 578a93bbbc9ecb6fa67aead760bfeb40e7977d39 Merge: 0ed966fde 4bc3983f6 Author: Nick Mathewson Date: Wed Jan 9 09:49:25 2019 -0500 Merge branch 'ticket28843' changes/ticket28843 | 3 +++ src/feature/control/control.c | 23 +++ 2 files changed, 26 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 673ea0a870811d6e0e9839a3932612f2779a4a74 Author: Translation commit bot Date: Wed Jan 9 14:45:48 2019 + Update translations for https_everywhere_completed --- fr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 116448576..1d549a019 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.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/https_everywhere] Update translations for https_everywhere
commit 6400a62d90417f799fac22b2e946bdb5c5d1d3d6 Author: Translation commit bot Date: Wed Jan 9 14:45:42 2019 + Update translations for https_everywhere --- fr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 71486cf27..1d549a019 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.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] [tor/master] Merge branch 'maint-0.3.5'
commit 0ed966fde111a892e3d0010cea3fd165b0c7972f Merge: d890ec29a 694e3c57f Author: Nick Mathewson Date: Wed Jan 9 09:38:27 2019 -0500 Merge branch 'maint-0.3.5' changes/bug28995 | 5 + src/lib/net/socketpair.c | 2 +- 2 files changed, 6 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.5] Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5
commit 694e3c57fd1af2cdaa4650d69c50f4108a8612f6 Merge: 380ae2b74 c59b572e9 Author: Nick Mathewson Date: Wed Jan 9 09:38:22 2019 -0500 Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5 changes/bug28995 | 5 + src/lib/net/socketpair.c | 2 +- 2 files changed, 6 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.5] Fix tor_ersatz_socketpair on IPv6-only systems
commit c59b572e934ec501cf7db78d10e36a6cf984b97b
Author: Kris Katterjohn
Date: Mon Jan 7 17:28:21 2019 -0600
Fix tor_ersatz_socketpair on IPv6-only systems
In get_local_listener used by tor_ersatz_socketpair, the address
family used when binding the IPv6 socket was AF_INET instead of
AF_INET6.
Fixes bug 28995; bugfix on 0.3.5.1-alpha.
Signed-off-by: Kris Katterjohn
---
changes/bug28995 | 5 +
src/lib/net/socketpair.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug28995 b/changes/bug28995
new file mode 100644
index 0..f76b6a085
--- /dev/null
+++ b/changes/bug28995
@@ -0,0 +1,5 @@
+ o Minor bugfix (IPv6):
+Fix tor_ersatz_socketpair on IPv6-only systems. Previously,
+the IPv6 socket was bound using an address family of AF_INET
+instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha.
+Patch from Kris Katterjohn.
diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c
index 380338f15..6a21581d8 100644
--- a/src/lib/net/socketpair.c
+++ b/src/lib/net/socketpair.c
@@ -62,7 +62,7 @@ get_local_listener(int family, int type)
len = sizeof(sin);
} else {
sa = (struct sockaddr *)
-sin6.sin6_family = AF_INET;
+sin6.sin6_family = AF_INET6;
sin6.sin6_addr.s6_addr[15] = 1;
len = sizeof(sin6);
}
___
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 'tor-github/pr/636' into maint-0.3.5
commit 694e3c57fd1af2cdaa4650d69c50f4108a8612f6 Merge: 380ae2b74 c59b572e9 Author: Nick Mathewson Date: Wed Jan 9 09:38:22 2019 -0500 Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5 changes/bug28995 | 5 + src/lib/net/socketpair.c | 2 +- 2 files changed, 6 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] Fix tor_ersatz_socketpair on IPv6-only systems
commit c59b572e934ec501cf7db78d10e36a6cf984b97b
Author: Kris Katterjohn
Date: Mon Jan 7 17:28:21 2019 -0600
Fix tor_ersatz_socketpair on IPv6-only systems
In get_local_listener used by tor_ersatz_socketpair, the address
family used when binding the IPv6 socket was AF_INET instead of
AF_INET6.
Fixes bug 28995; bugfix on 0.3.5.1-alpha.
Signed-off-by: Kris Katterjohn
---
changes/bug28995 | 5 +
src/lib/net/socketpair.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug28995 b/changes/bug28995
new file mode 100644
index 0..f76b6a085
--- /dev/null
+++ b/changes/bug28995
@@ -0,0 +1,5 @@
+ o Minor bugfix (IPv6):
+Fix tor_ersatz_socketpair on IPv6-only systems. Previously,
+the IPv6 socket was bound using an address family of AF_INET
+instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha.
+Patch from Kris Katterjohn.
diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c
index 380338f15..6a21581d8 100644
--- a/src/lib/net/socketpair.c
+++ b/src/lib/net/socketpair.c
@@ -62,7 +62,7 @@ get_local_listener(int family, int type)
len = sizeof(sin);
} else {
sa = (struct sockaddr *)
-sin6.sin6_family = AF_INET;
+sin6.sin6_family = AF_INET6;
sin6.sin6_addr.s6_addr[15] = 1;
len = sizeof(sin6);
}
___
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.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 830b659fedf52ad81554328a0601a5502a8ea72f Merge: 7db07d674 694e3c57f Author: Nick Mathewson Date: Wed Jan 9 09:38:27 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28995 | 5 + src/lib/net/socketpair.c | 2 +- 2 files changed, 6 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.5] Fix tor_ersatz_socketpair on IPv6-only systems
commit c59b572e934ec501cf7db78d10e36a6cf984b97b
Author: Kris Katterjohn
Date: Mon Jan 7 17:28:21 2019 -0600
Fix tor_ersatz_socketpair on IPv6-only systems
In get_local_listener used by tor_ersatz_socketpair, the address
family used when binding the IPv6 socket was AF_INET instead of
AF_INET6.
Fixes bug 28995; bugfix on 0.3.5.1-alpha.
Signed-off-by: Kris Katterjohn
---
changes/bug28995 | 5 +
src/lib/net/socketpair.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug28995 b/changes/bug28995
new file mode 100644
index 0..f76b6a085
--- /dev/null
+++ b/changes/bug28995
@@ -0,0 +1,5 @@
+ o Minor bugfix (IPv6):
+Fix tor_ersatz_socketpair on IPv6-only systems. Previously,
+the IPv6 socket was bound using an address family of AF_INET
+instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha.
+Patch from Kris Katterjohn.
diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c
index 380338f15..6a21581d8 100644
--- a/src/lib/net/socketpair.c
+++ b/src/lib/net/socketpair.c
@@ -62,7 +62,7 @@ get_local_listener(int family, int type)
len = sizeof(sin);
} else {
sa = (struct sockaddr *)
-sin6.sin6_family = AF_INET;
+sin6.sin6_family = AF_INET6;
sin6.sin6_addr.s6_addr[15] = 1;
len = sizeof(sin6);
}
___
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.5] Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5
commit 694e3c57fd1af2cdaa4650d69c50f4108a8612f6 Merge: 380ae2b74 c59b572e9 Author: Nick Mathewson Date: Wed Jan 9 09:38:22 2019 -0500 Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5 changes/bug28995 | 5 + src/lib/net/socketpair.c | 2 +- 2 files changed, 6 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] Stop logging 'Your Guard' in circpathbias.c
commit 380ae2b74b8c8762acc075d8d22bc5d6320655e1
Author: rl1987
Date: Sun Dec 23 19:21:37 2018 +0200
Stop logging 'Your Guard' in circpathbias.c
---
changes/bug28895 | 5 +
src/feature/client/circpathbias.c | 14 +++---
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/changes/bug28895 b/changes/bug28895
new file mode 100644
index 0..25fb167b2
--- /dev/null
+++ b/changes/bug28895
@@ -0,0 +1,5 @@
+ o Minor bugfixes (usability):
+- Stop saying "Your Guard ..." in pathbias_measure_{use,close}_rate()
+ as that confusingly suggests that mentioned guard node is under control
+ and responsibility of end user, which it is not. Fixes bug 28895;
+ bugfix on Tor 0.3.0.1-alpha.
diff --git a/src/feature/client/circpathbias.c
b/src/feature/client/circpathbias.c
index 9f2ed9347..eaeef5fe5 100644
--- a/src/feature/client/circpathbias.c
+++ b/src/feature/client/circpathbias.c
@@ -1332,7 +1332,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
if (pathbias_get_dropguards(options)) {
if (!pb->path_bias_disabled) {
log_warn(LD_CIRC,
- "Your Guard %s is failing to carry an extremely large "
+ "Guard %s is failing to carry an extremely large "
"amount of stream on its circuits. "
"To avoid potential route manipulation attacks, Tor has "
"disabled use of this guard. "
@@ -1356,7 +1356,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
} else if (!pb->path_bias_use_extreme) {
pb->path_bias_use_extreme = 1;
log_warn(LD_CIRC,
- "Your Guard %s is failing to carry an extremely large "
+ "Guard %s is failing to carry an extremely large "
"amount of streams on its circuits. "
"This could indicate a route manipulation attack, network "
"overload, bad local network connectivity, or a bug. "
@@ -1380,7 +1380,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
if (!pb->path_bias_use_noticed) {
pb->path_bias_use_noticed = 1;
log_notice(LD_CIRC,
- "Your Guard %s is failing to carry more streams on its "
+ "Guard %s is failing to carry more streams on its "
"circuits than usual. "
"Most likely this means the Tor network is overloaded "
"or your network connection is poor. "
@@ -1437,7 +1437,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (pathbias_get_dropguards(options)) {
if (!pb->path_bias_disabled) {
log_warn(LD_CIRC,
- "Your Guard %s is failing an extremely large "
+ "Guard %s is failing an extremely large "
"amount of circuits. "
"To avoid potential route manipulation attacks, Tor has "
"disabled use of this guard. "
@@ -1461,7 +1461,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
} else if (!pb->path_bias_extreme) {
pb->path_bias_extreme = 1;
log_warn(LD_CIRC,
- "Your Guard %s is failing an extremely large "
+ "Guard %s is failing an extremely large "
"amount of circuits. "
"This could indicate a route manipulation attack, "
"extreme network overload, or a bug. "
@@ -1485,7 +1485,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (!pb->path_bias_warned) {
pb->path_bias_warned = 1;
log_warn(LD_CIRC,
- "Your Guard %s is failing a very large "
+ "Guard %s is failing a very large "
"amount of circuits. "
"Most likely this means the Tor network is "
"overloaded, but it could also mean an attack against "
@@ -1510,7 +1510,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (!pb->path_bias_noticed) {
pb->path_bias_noticed = 1;
log_notice(LD_CIRC,
- "Your Guard %s is failing more circuits than "
+ "Guard %s is failing more circuits than "
"usual. "
"Most likely this means the Tor network is overloaded. "
"Success counts are %ld/%ld. Use counts are %ld/%ld. "
___
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.5] Stop logging 'Your Guard' in circpathbias.c
commit 380ae2b74b8c8762acc075d8d22bc5d6320655e1
Author: rl1987
Date: Sun Dec 23 19:21:37 2018 +0200
Stop logging 'Your Guard' in circpathbias.c
---
changes/bug28895 | 5 +
src/feature/client/circpathbias.c | 14 +++---
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/changes/bug28895 b/changes/bug28895
new file mode 100644
index 0..25fb167b2
--- /dev/null
+++ b/changes/bug28895
@@ -0,0 +1,5 @@
+ o Minor bugfixes (usability):
+- Stop saying "Your Guard ..." in pathbias_measure_{use,close}_rate()
+ as that confusingly suggests that mentioned guard node is under control
+ and responsibility of end user, which it is not. Fixes bug 28895;
+ bugfix on Tor 0.3.0.1-alpha.
diff --git a/src/feature/client/circpathbias.c
b/src/feature/client/circpathbias.c
index 9f2ed9347..eaeef5fe5 100644
--- a/src/feature/client/circpathbias.c
+++ b/src/feature/client/circpathbias.c
@@ -1332,7 +1332,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
if (pathbias_get_dropguards(options)) {
if (!pb->path_bias_disabled) {
log_warn(LD_CIRC,
- "Your Guard %s is failing to carry an extremely large "
+ "Guard %s is failing to carry an extremely large "
"amount of stream on its circuits. "
"To avoid potential route manipulation attacks, Tor has "
"disabled use of this guard. "
@@ -1356,7 +1356,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
} else if (!pb->path_bias_use_extreme) {
pb->path_bias_use_extreme = 1;
log_warn(LD_CIRC,
- "Your Guard %s is failing to carry an extremely large "
+ "Guard %s is failing to carry an extremely large "
"amount of streams on its circuits. "
"This could indicate a route manipulation attack, network "
"overload, bad local network connectivity, or a bug. "
@@ -1380,7 +1380,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
if (!pb->path_bias_use_noticed) {
pb->path_bias_use_noticed = 1;
log_notice(LD_CIRC,
- "Your Guard %s is failing to carry more streams on its "
+ "Guard %s is failing to carry more streams on its "
"circuits than usual. "
"Most likely this means the Tor network is overloaded "
"or your network connection is poor. "
@@ -1437,7 +1437,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (pathbias_get_dropguards(options)) {
if (!pb->path_bias_disabled) {
log_warn(LD_CIRC,
- "Your Guard %s is failing an extremely large "
+ "Guard %s is failing an extremely large "
"amount of circuits. "
"To avoid potential route manipulation attacks, Tor has "
"disabled use of this guard. "
@@ -1461,7 +1461,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
} else if (!pb->path_bias_extreme) {
pb->path_bias_extreme = 1;
log_warn(LD_CIRC,
- "Your Guard %s is failing an extremely large "
+ "Guard %s is failing an extremely large "
"amount of circuits. "
"This could indicate a route manipulation attack, "
"extreme network overload, or a bug. "
@@ -1485,7 +1485,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (!pb->path_bias_warned) {
pb->path_bias_warned = 1;
log_warn(LD_CIRC,
- "Your Guard %s is failing a very large "
+ "Guard %s is failing a very large "
"amount of circuits. "
"Most likely this means the Tor network is "
"overloaded, but it could also mean an attack against "
@@ -1510,7 +1510,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (!pb->path_bias_noticed) {
pb->path_bias_noticed = 1;
log_notice(LD_CIRC,
- "Your Guard %s is failing more circuits than "
+ "Guard %s is failing more circuits than "
"usual. "
"Most likely this means the Tor network is overloaded. "
"Success counts are %ld/%ld. Use counts are %ld/%ld. "
___
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.5] Stop logging 'Your Guard' in circpathbias.c
commit 380ae2b74b8c8762acc075d8d22bc5d6320655e1
Author: rl1987
Date: Sun Dec 23 19:21:37 2018 +0200
Stop logging 'Your Guard' in circpathbias.c
---
changes/bug28895 | 5 +
src/feature/client/circpathbias.c | 14 +++---
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/changes/bug28895 b/changes/bug28895
new file mode 100644
index 0..25fb167b2
--- /dev/null
+++ b/changes/bug28895
@@ -0,0 +1,5 @@
+ o Minor bugfixes (usability):
+- Stop saying "Your Guard ..." in pathbias_measure_{use,close}_rate()
+ as that confusingly suggests that mentioned guard node is under control
+ and responsibility of end user, which it is not. Fixes bug 28895;
+ bugfix on Tor 0.3.0.1-alpha.
diff --git a/src/feature/client/circpathbias.c
b/src/feature/client/circpathbias.c
index 9f2ed9347..eaeef5fe5 100644
--- a/src/feature/client/circpathbias.c
+++ b/src/feature/client/circpathbias.c
@@ -1332,7 +1332,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
if (pathbias_get_dropguards(options)) {
if (!pb->path_bias_disabled) {
log_warn(LD_CIRC,
- "Your Guard %s is failing to carry an extremely large "
+ "Guard %s is failing to carry an extremely large "
"amount of stream on its circuits. "
"To avoid potential route manipulation attacks, Tor has "
"disabled use of this guard. "
@@ -1356,7 +1356,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
} else if (!pb->path_bias_use_extreme) {
pb->path_bias_use_extreme = 1;
log_warn(LD_CIRC,
- "Your Guard %s is failing to carry an extremely large "
+ "Guard %s is failing to carry an extremely large "
"amount of streams on its circuits. "
"This could indicate a route manipulation attack, network "
"overload, bad local network connectivity, or a bug. "
@@ -1380,7 +1380,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
if (!pb->path_bias_use_noticed) {
pb->path_bias_use_noticed = 1;
log_notice(LD_CIRC,
- "Your Guard %s is failing to carry more streams on its "
+ "Guard %s is failing to carry more streams on its "
"circuits than usual. "
"Most likely this means the Tor network is overloaded "
"or your network connection is poor. "
@@ -1437,7 +1437,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (pathbias_get_dropguards(options)) {
if (!pb->path_bias_disabled) {
log_warn(LD_CIRC,
- "Your Guard %s is failing an extremely large "
+ "Guard %s is failing an extremely large "
"amount of circuits. "
"To avoid potential route manipulation attacks, Tor has "
"disabled use of this guard. "
@@ -1461,7 +1461,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
} else if (!pb->path_bias_extreme) {
pb->path_bias_extreme = 1;
log_warn(LD_CIRC,
- "Your Guard %s is failing an extremely large "
+ "Guard %s is failing an extremely large "
"amount of circuits. "
"This could indicate a route manipulation attack, "
"extreme network overload, or a bug. "
@@ -1485,7 +1485,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (!pb->path_bias_warned) {
pb->path_bias_warned = 1;
log_warn(LD_CIRC,
- "Your Guard %s is failing a very large "
+ "Guard %s is failing a very large "
"amount of circuits. "
"Most likely this means the Tor network is "
"overloaded, but it could also mean an attack against "
@@ -1510,7 +1510,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (!pb->path_bias_noticed) {
pb->path_bias_noticed = 1;
log_notice(LD_CIRC,
- "Your Guard %s is failing more circuits than "
+ "Guard %s is failing more circuits than "
"usual. "
"Most likely this means the Tor network is overloaded. "
"Success counts are %ld/%ld. Use counts are %ld/%ld. "
___
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.5'
commit d890ec29aac33848a3965585965af5f2080206a4 Merge: 3df1d29d9 380ae2b74 Author: Nick Mathewson Date: Wed Jan 9 09:35:40 2019 -0500 Merge branch 'maint-0.3.5' changes/bug28895 | 5 + src/feature/client/circpathbias.c | 14 +++--- 2 files changed, 12 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.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 7db07d67411202bf16b9bacec2b12d5f93999209 Merge: 7ce8548c2 380ae2b74 Author: Nick Mathewson Date: Wed Jan 9 09:35:40 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28895 | 5 + src/feature/client/circpathbias.c | 14 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Dir: when Tor's clock is behind, use a future consensus to bootstrap
commit 7a45bc74a430ff64f0696c77f075f9c830822413
Author: teor
Date: Thu Nov 29 00:46:39 2018 +1000
Dir: when Tor's clock is behind, use a future consensus to bootstrap
When Tor's clock is behind the clocks on the authorities, allow Tor to
bootstrap successfully.
Fixes bug 28591; bugfix on 0.2.0.9-alpha.
---
changes/bug28591 | 4
src/feature/nodelist/microdesc.c | 10 ++
src/feature/nodelist/networkstatus.c | 35 ---
src/feature/nodelist/networkstatus.h | 2 ++
src/test/test_entrynodes.c | 32 ++--
src/test/test_routerlist.c | 1 -
6 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/changes/bug28591 b/changes/bug28591
new file mode 100644
index 0..3a1c96ac1
--- /dev/null
+++ b/changes/bug28591
@@ -0,0 +1,4 @@
+ o Minor bugfixes (client, bootstrap):
+- When Tor's clock is behind the clocks on the authorities, allow Tor to
+ bootstrap successfully. Fixes bug 28591; bugfix on 0.2.0.9-alpha.
+
diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c
index 3f5085412..8c5a9ee61 100644
--- a/src/feature/nodelist/microdesc.c
+++ b/src/feature/nodelist/microdesc.c
@@ -110,8 +110,9 @@ microdesc_note_outdated_dirserver(const char *relay_digest)
/* If we have a reasonably live consensus, then most of our dirservers should
* still be caching all the microdescriptors in it. Reasonably live
- * consensuses are up to a day old. But microdescriptors expire 7 days after
- * the last consensus that referenced them. */
+ * consensuses are up to a day old (or a day in the future). But
+ * microdescriptors expire 7 days after the last consensus that referenced
+ * them. */
if (!networkstatus_get_reasonably_live_consensus(approx_time(),
FLAV_MICRODESC)) {
return;
@@ -544,8 +545,8 @@ microdesc_cache_clean(microdesc_cache_t *cache, time_t
cutoff, int force)
size_t bytes_dropped = 0;
time_t now = time(NULL);
- /* If we don't know a live consensus, don't believe last_listed values: we
- * might be starting up after being down for a while. */
+ /* If we don't know a reasonably live consensus, don't believe last_listed
+ * values: we might be starting up after being down for a while. */
if (! force &&
! networkstatus_get_reasonably_live_consensus(now, FLAV_MICRODESC))
return;
@@ -973,6 +974,7 @@ update_microdesc_downloads(time_t now)
if (directory_too_idle_to_fetch_descriptors(options, now))
return;
+ /* Give up if we don't have a reasonably live consensus. */
consensus = networkstatus_get_reasonably_live_consensus(now, FLAV_MICRODESC);
if (!consensus)
return;
diff --git a/src/feature/nodelist/networkstatus.c
b/src/feature/nodelist/networkstatus.c
index 51e720a98..a40c3dfb2 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -1377,7 +1377,7 @@
networkstatus_get_dl_status_by_flavor_running,(consensus_flavor_t flavor))
}
/** Return the most recent consensus that we have downloaded, or NULL if we
- * don't have one. */
+ * don't have one. May return future or expired consensuses. */
MOCK_IMPL(networkstatus_t *,
networkstatus_get_latest_consensus,(void))
{
@@ -1388,7 +1388,7 @@ networkstatus_get_latest_consensus,(void))
}
/** Return the latest consensus we have whose flavor matches f, or NULL
- * if we don't have one. */
+ * if we don't have one. May return future or expired consensuses. */
MOCK_IMPL(networkstatus_t *,
networkstatus_get_latest_consensus_by_flavor,(consensus_flavor_t f))
{
@@ -1422,10 +1422,11 @@ networkstatus_is_live(const networkstatus_t *ns, time_t
now)
return (ns->valid_after <= now && now <= ns->valid_until);
}
-/** Determine if consensus is valid or expired recently enough that
- * we can still use it.
+/** Determine if consensus is valid, or expired recently enough, or not
+ * too far in the future, so that we can still use it.
*
- * Return 1 if the consensus is reasonably live, or 0 if it is too old.
+ * Return 1 if the consensus is reasonably live, or 0 if it is too old or
+ * too new.
*/
int
networkstatus_consensus_reasonably_live(const networkstatus_t *consensus,
@@ -1434,29 +1435,42 @@ networkstatus_consensus_reasonably_live(const
networkstatus_t *consensus,
if (BUG(!consensus))
return 0;
- return networkstatus_valid_until_is_reasonably_live(consensus->valid_until,
+ return networkstatus_valid_after_is_reasonably_live(consensus->valid_after,
+ now) &&
+ networkstatus_valid_until_is_reasonably_live(consensus->valid_until,
now);
}
+#define REASONABLY_LIVE_TIME (24*60*60)
+
+/** As networkstatus_consensus_reasonably_live, but takes a valid_after
+ * time, and checks to see if it is
[tor-commits] [tor/master] Dir: Refactor ns expiry check to remove duplicate code
commit bd29b3531a48b41f6eee5b4a29769a13ef199298
Author: teor
Date: Thu Nov 29 01:06:19 2018 +1000
Dir: Refactor ns expiry check to remove duplicate code
Instead of checking NS_EXPIRY_SLOP, use
networkstatus_consensus_reasonably_live().
Preparation for 28591.
---
src/core/mainloop/mainloop.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 7eff82fee..af2bc8262 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -2028,11 +2028,9 @@ check_expired_networkstatus_callback(time_t now, const
or_options_t *options)
(void)options;
/* Check whether our networkstatus has expired. */
networkstatus_t *ns = networkstatus_get_latest_consensus();
- /* RD: This value needs to be the same as REASONABLY_LIVE_TIME in
- * networkstatus_get_reasonably_live_consensus(), but that value is way
- * way too high. Arma: is the bridge issue there resolved yet? -NM */
-#define NS_EXPIRY_SLOP (24*60*60)
- if (ns && ns->valid_until < (now - NS_EXPIRY_SLOP) &&
+ /* Use reasonably live consensuses until they are no longer reasonably live.
+ */
+ if (ns && !networkstatus_consensus_reasonably_live(ns, now) &&
router_have_minimum_dir_info()) {
router_dir_info_changed();
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [sbws/master] CI: change to Ubuntu Xenial
commit cd61cb3c0b219ad94f7a95cb4abd141b17c08d77 Author: juga0 Date: Wed Jan 9 14:25:47 2019 + CI: change to Ubuntu Xenial since deb.torproject.org does not support anymore Trusty. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d117c9..aa477ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: true +dist: xenial language: python python: - "3.5" @@ -14,8 +15,7 @@ script: before_install: - gpg --version - sudo apt-key add tests/deb.torproject.org.asc -- echo "deb https://deb.torproject.org/torproject.org trusty main" | sudo tee -a /etc/apt/sources.list -- echo "deb-src https://deb.torproject.org/torproject.org trusty main" | sudo tee -a /etc/apt/sources.list +- echo "deb https://deb.torproject.org/torproject.org xenial main" | sudo tee -a /etc/apt/sources.list - sudo apt-get update -qq - sudo apt-get install tor -y ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Dir: allow directory mirrors to serve future consensuses
commit 44db455cc894b4a0fda80a28ed5ea55bf4d41231
Author: teor
Date: Thu Nov 29 01:03:03 2018 +1000
Dir: allow directory mirrors to serve future consensuses
When Tor's clock is behind the clocks on the authorities, allow Tor to
serve future consensuses.
Fixes bug 28654; bugfix on 0.3.0.1-alpha.
---
changes/bug28654| 3 ++
src/feature/dircache/dircache.c | 73 -
2 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/changes/bug28654 b/changes/bug28654
new file mode 100644
index 0..4ca843309
--- /dev/null
+++ b/changes/bug28654
@@ -0,0 +1,3 @@
+ o Minor bugfixes (directory mirror):
+- When Tor's clock is behind the clocks on the authorities, allow Tor to
+ serve future consensuses. Fixes bug 28654; bugfix on 0.3.0.1-alpha.
diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c
index 872a88018..ce90f4910 100644
--- a/src/feature/dircache/dircache.c
+++ b/src/feature/dircache/dircache.c
@@ -495,28 +495,47 @@ handle_get_frontpage(dir_connection_t *conn, const
get_handler_args_t *args)
}
/** Warn that the cached consensus consensus of type
- * flavor is too old and will not be served to clients. Rate-limit the
- * warning to avoid logging an entry on every request.
+ * flavor too new or too old, based on is_too_new,
+ * and will not be served to clients. Rate-limit the warning to avoid logging
+ * an entry on every request.
*/
static void
-warn_consensus_is_too_old(const struct consensus_cache_entry_t *consensus,
- const char *flavor, time_t now)
+warn_consensus_is_not_reasonably_live(
+ const struct consensus_cache_entry_t *consensus,
+ const char *flavor, time_t now, bool is_too_new)
{
-#define TOO_OLD_WARNING_INTERVAL (60*60)
- static ratelim_t warned = RATELIM_INIT(TOO_OLD_WARNING_INTERVAL);
+#define NOT_REASONABLY_LIVE_WARNING_INTERVAL (60*60)
+ static ratelim_t warned[2] = { RATELIM_INIT(
+ NOT_REASONABLY_LIVE_WARNING_INTERVAL),
+RATELIM_INIT(
+ NOT_REASONABLY_LIVE_WARNING_INTERVAL) };
char timestamp[ISO_TIME_LEN+1];
- time_t valid_until;
- char *dupes;
+ /* valid_after if is_too_new, valid_until if !is_too_new */
+ time_t valid_time = 0;
+ char *dupes = NULL;
- if (consensus_cache_entry_get_valid_until(consensus, _until))
-return;
-
- if ((dupes = rate_limit_log(, now))) {
-format_local_iso_time(timestamp, valid_until);
-log_warn(LD_DIRSERV, "Our %s%sconsensus is too old, so we will not "
- "serve it to clients. It was valid until %s local time and we "
- "continued to serve it for up to 24 hours after it expired.%s",
- flavor ? flavor : "", flavor ? " " : "", timestamp, dupes);
+ if (is_too_new) {
+if (consensus_cache_entry_get_valid_after(consensus, _time))
+ return;
+dupes = rate_limit_log([1], now);
+ } else {
+if (consensus_cache_entry_get_valid_until(consensus, _time))
+ return;
+dupes = rate_limit_log([0], now);
+ }
+
+ if (dupes) {
+format_local_iso_time(timestamp, valid_time);
+log_warn(LD_DIRSERV, "Our %s%sconsensus is too %s, so we will not "
+ "serve it to clients. It was valid %s %s local time and we "
+ "continued to serve it for up to 24 hours %s.%s",
+ flavor ? flavor : "",
+ flavor ? " " : "",
+ is_too_new ? "new" : "old",
+ is_too_new ? "after" : "until",
+ timestamp,
+ is_too_new ? "before it was valid" : "after it expired",
+ dupes);
tor_free(dupes);
}
}
@@ -859,7 +878,6 @@ handle_get_current_consensus(dir_connection_t *conn,
if (req.diff_only && !cached_consensus) {
write_short_http_response(conn, 404, "No such diff available");
-// warn_consensus_is_too_old(v, req.flavor, now);
geoip_note_ns_response(GEOIP_REJECT_NOT_FOUND);
goto done;
}
@@ -870,19 +888,30 @@ handle_get_current_consensus(dir_connection_t *conn,
_used);
}
- time_t fresh_until, valid_until;
- int have_fresh_until = 0, have_valid_until = 0;
+ time_t valid_after, fresh_until, valid_until;
+ int have_valid_after = 0, have_fresh_until = 0, have_valid_until = 0;
if (cached_consensus) {
+have_valid_after =
+ !consensus_cache_entry_get_valid_after(cached_consensus, _after);
have_fresh_until =
!consensus_cache_entry_get_fresh_until(cached_consensus, _until);
have_valid_until =
!consensus_cache_entry_get_valid_until(cached_consensus, _until);
}
- if (cached_consensus && have_valid_until &&
+ if (cached_consensus && have_valid_after &&
+ !networkstatus_valid_after_is_reasonably_live(valid_after, now)) {
+write_short_http_response(conn, 404, "Consensus is too
[tor-commits] [tor/master] Merge branch 'bug28591_035_squashed'
commit 3df1d29d9b5ccb3b49760105ca7fd434e22d3924 Merge: e6a440120 44db455cc Author: Nick Mathewson Date: Wed Jan 9 09:33:31 2019 -0500 Merge branch 'bug28591_035_squashed' changes/bug28591 | 4 ++ changes/bug28654 | 3 ++ src/core/mainloop/mainloop.c | 8 ++-- src/feature/dircache/dircache.c | 73 +--- src/feature/nodelist/microdesc.c | 10 +++-- src/feature/nodelist/networkstatus.c | 35 +++-- src/feature/nodelist/networkstatus.h | 2 + src/test/test_entrynodes.c | 32 +++- src/test/test_routerlist.c | 1 - 9 files changed, 115 insertions(+), 53 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 971ace0a2d2ddd7a64301da5a8b5ebbac2c72346 Author: Translation commit bot Date: Wed Jan 9 14:15:59 2019 + Update translations for https_everywhere_completed --- ka/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd index be46806db..67992ec64 100644 --- a/ka/https-everywhere.dtd +++ b/ka/https-everywhere.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/https_everywhere] Update translations for https_everywhere
commit 85ad1f3cab20d049f80686b0518e4e80307badf9 Author: Translation commit bot Date: Wed Jan 9 14:15:52 2019 + Update translations for https_everywhere --- ka/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd index d58183415..67992ec64 100644 --- a/ka/https-everywhere.dtd +++ b/ka/https-everywhere.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] [tor/master] Fix (and make consistent) the use of OpenBSD preprocessor macro tests
commit c13a81f7f96a6433709b90c343d358c93cc7b9f8
Author: Kris Katterjohn
Date: Sun Dec 23 14:51:45 2018 -0600
Fix (and make consistent) the use of OpenBSD preprocessor macro tests
Prior to this commit, the testsuite was failing on OpenBSD. After
this commit the testsuite runs fine on OpenBSD.
It was previously decided to test for the OpenBSD macro (rather than
__OpenBSD__, etc.) because OpenBSD forks seem to have the former
macro defined. sys/param.h must be included for the OpenBSD macro
definition; however, many files tested for the OpenBSD macro without
having this header included.
This commit includes sys/param.h in the files where the OpenBSD macro
is used (and sys/param.h is not already included), and it also
changes some instances of the __OpenBSD__ macro to OpenBSD.
See commit 27df23abb675ffeb198bf0c1cc85c4baed77a988 which changed
everything to use OpenBSD instead of __OpenBSD__ or OPENBSD. See
also tickets #6982 and #20980 (the latter ticket is where it was
decided to use the OpenBSD macro).
Signed-off-by: Kris Katterjohn
---
src/app/config/config.c | 3 +++
src/core/or/connection_edge.c | 3 +++
src/ext/byteorder.h | 4
src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +-
src/ext/trunnel/trunnel.c | 6 +-
src/lib/err/backtrace.c | 3 +++
src/lib/net/inaddr_st.h | 5 -
src/test/test-memwipe.c | 4
src/test/test_options.c | 4
9 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 4a8f94da0..c71ed0184 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -131,6 +131,9 @@
#ifdef HAVE_SYS_STAT_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#ifdef HAVE_UNISTD_H
#include
#endif
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 58aefcf8f..2ec83c120 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -139,6 +139,9 @@
#ifdef HAVE_SYS_IOCTL_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H)
#include
diff --git a/src/ext/byteorder.h b/src/ext/byteorder.h
index c8ba52184..95e080b14 100644
--- a/src/ext/byteorder.h
+++ b/src/ext/byteorder.h
@@ -29,6 +29,10 @@
Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c)
*/
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
+
/* This code is extracted from csiphash.h */
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
diff --git a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
index 26a264cf9..3e0f9cfc5 100644
--- a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
+++ b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
@@ -14,7 +14,7 @@
#define OS_OSX
#elif defined(macintosh) || defined(Macintosh)
#define OS_MAC
- #elif defined(__OpenBSD__)
+ #elif defined(OpenBSD)
#define OS_OPENBSD
#endif
#endif
diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index b749d8136..2442bc390 100644
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -14,6 +14,10 @@
#include
#include
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
+
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
# define IS_LITTLE_ENDIAN 1
@@ -31,7 +35,7 @@
#define IS_LITTLE_ENDIAN
# endif
#else
-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD)
# include
# else
# include
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c
index d18a595c3..b568c888c 100644
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@ -32,6 +32,9 @@
#ifdef HAVE_SIGNAL_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#include
#include
#include
diff --git a/src/lib/net/inaddr_st.h b/src/lib/net/inaddr_st.h
index dc4c6e3a0..a6b779626 100644
--- a/src/lib/net/inaddr_st.h
+++ b/src/lib/net/inaddr_st.h
@@ -28,6 +28,9 @@
#ifdef HAVE_SYS_SOCKET_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#ifdef _WIN32
#include
@@ -60,7 +63,7 @@ struct in6_addr
/** @{ */
/** Many BSD variants seem not to define these. */
#if defined(__APPLE__) || defined(__darwin__) || \
- defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD)
#ifndef
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 7ce8548c23abbd853463cd8a0fd8172f04c4 Merge: f9e526629 09472791d Author: Nick Mathewson Date: Wed Jan 9 08:52:10 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28938| 4 src/app/config/config.c | 3 +++ src/core/or/connection_edge.c | 3 +++ src/ext/byteorder.h | 4 src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +- src/ext/trunnel/trunnel.c | 6 +- src/lib/err/backtrace.c | 3 +++ src/lib/net/inaddr_st.h | 5 - src/test/test-memwipe.c | 4 src/test/test_options.c | 4 10 files changed, 35 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.5'
commit e6a44012001afb2d4c5956e4b55ccf6b622fd79e Merge: a891d81c5 09472791d Author: Nick Mathewson Date: Wed Jan 9 08:52:10 2019 -0500 Merge branch 'maint-0.3.5' changes/bug28938| 4 src/app/config/config.c | 3 +++ src/core/or/connection_edge.c | 3 +++ src/ext/byteorder.h | 4 src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +- src/ext/trunnel/trunnel.c | 6 +- src/lib/err/backtrace.c | 3 +++ src/lib/net/inaddr_st.h | 5 - src/test/test-memwipe.c | 4 src/test/test_options.c | 4 10 files changed, 35 insertions(+), 3 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.5] Fix (and make consistent) the use of OpenBSD preprocessor macro tests
commit c13a81f7f96a6433709b90c343d358c93cc7b9f8
Author: Kris Katterjohn
Date: Sun Dec 23 14:51:45 2018 -0600
Fix (and make consistent) the use of OpenBSD preprocessor macro tests
Prior to this commit, the testsuite was failing on OpenBSD. After
this commit the testsuite runs fine on OpenBSD.
It was previously decided to test for the OpenBSD macro (rather than
__OpenBSD__, etc.) because OpenBSD forks seem to have the former
macro defined. sys/param.h must be included for the OpenBSD macro
definition; however, many files tested for the OpenBSD macro without
having this header included.
This commit includes sys/param.h in the files where the OpenBSD macro
is used (and sys/param.h is not already included), and it also
changes some instances of the __OpenBSD__ macro to OpenBSD.
See commit 27df23abb675ffeb198bf0c1cc85c4baed77a988 which changed
everything to use OpenBSD instead of __OpenBSD__ or OPENBSD. See
also tickets #6982 and #20980 (the latter ticket is where it was
decided to use the OpenBSD macro).
Signed-off-by: Kris Katterjohn
---
src/app/config/config.c | 3 +++
src/core/or/connection_edge.c | 3 +++
src/ext/byteorder.h | 4
src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +-
src/ext/trunnel/trunnel.c | 6 +-
src/lib/err/backtrace.c | 3 +++
src/lib/net/inaddr_st.h | 5 -
src/test/test-memwipe.c | 4
src/test/test_options.c | 4
9 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 4a8f94da0..c71ed0184 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -131,6 +131,9 @@
#ifdef HAVE_SYS_STAT_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#ifdef HAVE_UNISTD_H
#include
#endif
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 58aefcf8f..2ec83c120 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -139,6 +139,9 @@
#ifdef HAVE_SYS_IOCTL_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H)
#include
diff --git a/src/ext/byteorder.h b/src/ext/byteorder.h
index c8ba52184..95e080b14 100644
--- a/src/ext/byteorder.h
+++ b/src/ext/byteorder.h
@@ -29,6 +29,10 @@
Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c)
*/
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
+
/* This code is extracted from csiphash.h */
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
diff --git a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
index 26a264cf9..3e0f9cfc5 100644
--- a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
+++ b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
@@ -14,7 +14,7 @@
#define OS_OSX
#elif defined(macintosh) || defined(Macintosh)
#define OS_MAC
- #elif defined(__OpenBSD__)
+ #elif defined(OpenBSD)
#define OS_OPENBSD
#endif
#endif
diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index b749d8136..2442bc390 100644
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -14,6 +14,10 @@
#include
#include
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
+
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
# define IS_LITTLE_ENDIAN 1
@@ -31,7 +35,7 @@
#define IS_LITTLE_ENDIAN
# endif
#else
-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD)
# include
# else
# include
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c
index d18a595c3..b568c888c 100644
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@ -32,6 +32,9 @@
#ifdef HAVE_SIGNAL_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#include
#include
#include
diff --git a/src/lib/net/inaddr_st.h b/src/lib/net/inaddr_st.h
index dc4c6e3a0..a6b779626 100644
--- a/src/lib/net/inaddr_st.h
+++ b/src/lib/net/inaddr_st.h
@@ -28,6 +28,9 @@
#ifdef HAVE_SYS_SOCKET_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#ifdef _WIN32
#include
@@ -60,7 +63,7 @@ struct in6_addr
/** @{ */
/** Many BSD variants seem not to define these. */
#if defined(__APPLE__) || defined(__darwin__) || \
- defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD)
#ifndef
[tor-commits] [tor/master] Add changes file for bug 28938
commit 09472791d0ccf5b527a5b59eceb218aff38c2880 Author: Kris Katterjohn Date: Mon Jan 7 20:01:52 2019 -0600 Add changes file for bug 28938 The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0. Signed-off-by: Kris Katterjohn --- changes/bug28938 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug28938 b/changes/bug28938 new file mode 100644 index 0..de6c5f7b7 --- /dev/null +++ b/changes/bug28938 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): +- Fix missing headers required for proper detection of + OpenBSD. Fixes bug 28938; bugfix on 0.3.5.1-alpha. + Patch from Kris Katterjohn. ___ 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.5] Add changes file for bug 28938
commit 09472791d0ccf5b527a5b59eceb218aff38c2880 Author: Kris Katterjohn Date: Mon Jan 7 20:01:52 2019 -0600 Add changes file for bug 28938 The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0. Signed-off-by: Kris Katterjohn --- changes/bug28938 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug28938 b/changes/bug28938 new file mode 100644 index 0..de6c5f7b7 --- /dev/null +++ b/changes/bug28938 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): +- Fix missing headers required for proper detection of + OpenBSD. Fixes bug 28938; bugfix on 0.3.5.1-alpha. + Patch from Kris Katterjohn. ___ 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.5] Fix (and make consistent) the use of OpenBSD preprocessor macro tests
commit c13a81f7f96a6433709b90c343d358c93cc7b9f8
Author: Kris Katterjohn
Date: Sun Dec 23 14:51:45 2018 -0600
Fix (and make consistent) the use of OpenBSD preprocessor macro tests
Prior to this commit, the testsuite was failing on OpenBSD. After
this commit the testsuite runs fine on OpenBSD.
It was previously decided to test for the OpenBSD macro (rather than
__OpenBSD__, etc.) because OpenBSD forks seem to have the former
macro defined. sys/param.h must be included for the OpenBSD macro
definition; however, many files tested for the OpenBSD macro without
having this header included.
This commit includes sys/param.h in the files where the OpenBSD macro
is used (and sys/param.h is not already included), and it also
changes some instances of the __OpenBSD__ macro to OpenBSD.
See commit 27df23abb675ffeb198bf0c1cc85c4baed77a988 which changed
everything to use OpenBSD instead of __OpenBSD__ or OPENBSD. See
also tickets #6982 and #20980 (the latter ticket is where it was
decided to use the OpenBSD macro).
Signed-off-by: Kris Katterjohn
---
src/app/config/config.c | 3 +++
src/core/or/connection_edge.c | 3 +++
src/ext/byteorder.h | 4
src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +-
src/ext/trunnel/trunnel.c | 6 +-
src/lib/err/backtrace.c | 3 +++
src/lib/net/inaddr_st.h | 5 -
src/test/test-memwipe.c | 4
src/test/test_options.c | 4
9 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 4a8f94da0..c71ed0184 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -131,6 +131,9 @@
#ifdef HAVE_SYS_STAT_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#ifdef HAVE_UNISTD_H
#include
#endif
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 58aefcf8f..2ec83c120 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -139,6 +139,9 @@
#ifdef HAVE_SYS_IOCTL_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H)
#include
diff --git a/src/ext/byteorder.h b/src/ext/byteorder.h
index c8ba52184..95e080b14 100644
--- a/src/ext/byteorder.h
+++ b/src/ext/byteorder.h
@@ -29,6 +29,10 @@
Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c)
*/
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
+
/* This code is extracted from csiphash.h */
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
diff --git a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
index 26a264cf9..3e0f9cfc5 100644
--- a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
+++ b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h
@@ -14,7 +14,7 @@
#define OS_OSX
#elif defined(macintosh) || defined(Macintosh)
#define OS_MAC
- #elif defined(__OpenBSD__)
+ #elif defined(OpenBSD)
#define OS_OPENBSD
#endif
#endif
diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index b749d8136..2442bc390 100644
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -14,6 +14,10 @@
#include
#include
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
+
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
# define IS_LITTLE_ENDIAN 1
@@ -31,7 +35,7 @@
#define IS_LITTLE_ENDIAN
# endif
#else
-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD)
# include
# else
# include
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c
index d18a595c3..b568c888c 100644
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@ -32,6 +32,9 @@
#ifdef HAVE_SIGNAL_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#include
#include
#include
diff --git a/src/lib/net/inaddr_st.h b/src/lib/net/inaddr_st.h
index dc4c6e3a0..a6b779626 100644
--- a/src/lib/net/inaddr_st.h
+++ b/src/lib/net/inaddr_st.h
@@ -28,6 +28,9 @@
#ifdef HAVE_SYS_SOCKET_H
#include
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include
+#endif
#ifdef _WIN32
#include
@@ -60,7 +63,7 @@ struct in6_addr
/** @{ */
/** Many BSD variants seem not to define these. */
#if defined(__APPLE__) || defined(__darwin__) || \
- defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD)
#ifndef
[tor-commits] [tor/maint-0.3.5] Add changes file for bug 28938
commit 09472791d0ccf5b527a5b59eceb218aff38c2880 Author: Kris Katterjohn Date: Mon Jan 7 20:01:52 2019 -0600 Add changes file for bug 28938 The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0. Signed-off-by: Kris Katterjohn --- changes/bug28938 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug28938 b/changes/bug28938 new file mode 100644 index 0..de6c5f7b7 --- /dev/null +++ b/changes/bug28938 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): +- Fix missing headers required for proper detection of + OpenBSD. Fixes bug 28938; bugfix on 0.3.5.1-alpha. + Patch from Kris Katterjohn. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Remove strcmp_len(): it is now unused
commit 29254812a3428da4ffeaede5d211364d942f94ab
Author: Nick Mathewson
Date: Mon Dec 17 09:04:25 2018 -0500
Remove strcmp_len(): it is now unused
(See 28856.)
---
src/lib/string/util_string.c | 15 ---
src/lib/string/util_string.h | 1 -
src/test/test_util.c | 9 -
3 files changed, 25 deletions(-)
diff --git a/src/lib/string/util_string.c b/src/lib/string/util_string.c
index e76e73046..36e19d029 100644
--- a/src/lib/string/util_string.c
+++ b/src/lib/string/util_string.c
@@ -212,21 +212,6 @@ strcmpstart(const char *s1, const char *s2)
return strncmp(s1, s2, n);
}
-/** Compare the s1_len-byte string s1 with s2,
- * without depending on a terminating nul in s1. Sorting order is first by
- * length, then lexically; return values are as for strcmp.
- */
-int
-strcmp_len(const char *s1, const char *s2, size_t s1_len)
-{
- size_t s2_len = strlen(s2);
- if (s1_len < s2_len)
-return -1;
- if (s1_len > s2_len)
-return 1;
- return fast_memcmp(s1, s2, s2_len);
-}
-
/** Compares the first strlen(s2) characters of s1 with s2. Returns as for
* strcasecmp.
*/
diff --git a/src/lib/string/util_string.h b/src/lib/string/util_string.h
index 99467a27c..6541afa4c 100644
--- a/src/lib/string/util_string.h
+++ b/src/lib/string/util_string.h
@@ -33,7 +33,6 @@ int tor_strisnonupper(const char *s);
int tor_strisspace(const char *s);
int strcmp_opt(const char *s1, const char *s2);
int strcmpstart(const char *s1, const char *s2);
-int strcmp_len(const char *s1, const char *s2, size_t len);
int strcasecmpstart(const char *s1, const char *s2);
int strcmpend(const char *s1, const char *s2);
int strcasecmpend(const char *s1, const char *s2);
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 2b4d64e42..7ac1a1ec4 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -2153,15 +2153,6 @@ test_util_strmisc(void *arg)
tt_int_op(strcmp_opt(NULL, "foo"), OP_LT, 0);
tt_int_op(strcmp_opt("foo", NULL), OP_GT, 0);
- /* Test strcmp_len */
- tt_int_op(strcmp_len("foo", "bar", 3), OP_GT, 0);
- tt_int_op(strcmp_len("foo", "bar", 2), OP_LT, 0);
- tt_int_op(strcmp_len("foo2", "foo1", 4), OP_GT, 0);
- tt_int_op(strcmp_len("foo2", "foo1", 3), OP_LT, 0); /* Really stop at len */
- tt_int_op(strcmp_len("foo2", "foo", 3), OP_EQ, 0); /* Really stop at len */
- tt_int_op(strcmp_len("blah", "", 4), OP_GT, 0);
- tt_int_op(strcmp_len("blah", "", 0),OP_EQ, 0);
-
done:
tor_free(cp_tmp);
}
___
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 'ticket28856_v2'
commit f9a7701ff1228b7f1c58b4a2c9716b705cb0d126
Merge: ae578981b 29254812a
Author: Nick Mathewson
Date: Wed Jan 9 08:46:40 2019 -0500
Merge branch 'ticket28856_v2'
src/feature/dirparse/parsecommon.c | 21 -
src/lib/string/util_string.c | 15 ---
src/lib/string/util_string.h | 1 -
src/test/test_util.c | 9 -
4 files changed, 16 insertions(+), 30 deletions(-)
diff --cc src/feature/dirparse/parsecommon.c
index b53b0fe19,a69957e74..88df5eec6
--- a/src/feature/dirparse/parsecommon.c
+++ b/src/feature/dirparse/parsecommon.c
@@@ -351,8 -363,9 +362,8 @@@ get_next_token(memarea_t *area
if (!eol || eol-*s<11 || strcmpstart(*s, "-BEGIN ")) /* No object. */
goto check_object;
- obstart = *s; /* Set obstart to start of object spec */
if (eol - *s <= 16 || memchr(*s+11,'\0',eol-*s-16) || /* no short lines, */
- strcmp_len(eol-5, "-", 5) || /* nuls or invalid endings */
+ !mem_eq_token(eol-5, 5, "-") || /* nuls or invalid endings */
(eol-*s) > MAX_UNPARSED_OBJECT_SIZE) { /* name too long */
RET_ERR("Malformed object: bad begin line");
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Changes file for 28856
commit a891d81c5f62cdda37b4371ebe2782e23e4f6db1 Author: Nick Mathewson Date: Wed Jan 9 08:48:11 2019 -0500 Changes file for 28856 --- changes/ticket28856 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket28856 b/changes/ticket28856 new file mode 100644 index 0..b13647049 --- /dev/null +++ b/changes/ticket28856 @@ -0,0 +1,3 @@ + o Minor features (performance): +- Speed up directory parsing a little by avoiding use of the + non-inlined strcmp_len() function. Closes ticket 28856. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Replace use of strcmp_len() with new mem_eq_token().
commit a0fad3981e9d072188c6ba19f25bdd78962330d8
Author: Nick Mathewson
Date: Mon Dec 17 09:03:04 2018 -0500
Replace use of strcmp_len() with new mem_eq_token().
The strcmp_len() function was somewhat misconceived, since we're
only using it to test whether a length+extent string is equal to a
NUL-terminated string or not. By simplifying it and making it
inlined, we should be able to make it a little faster.
(It *does* show up in profiles.)
Closes ticket 28856.
---
src/feature/dirparse/parsecommon.c | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/feature/dirparse/parsecommon.c
b/src/feature/dirparse/parsecommon.c
index e00af0eea..a69957e74 100644
--- a/src/feature/dirparse/parsecommon.c
+++ b/src/feature/dirparse/parsecommon.c
@@ -15,6 +15,7 @@
#include "lib/string/printf.h"
#include "lib/memarea/memarea.h"
#include "lib/crypt_ops/crypto_rsa.h"
+#include "lib/ctime/di_ops.h"
#include
@@ -251,6 +252,16 @@ token_check_object(memarea_t *area, const char *kwd,
return tok;
}
+/** Return true iff the memlen-byte chunk of memory at
+ * memlen is the same length as token, and their
+ * contents are equal. */
+static bool
+mem_eq_token(const void *mem, size_t memlen, const char *token)
+{
+ size_t len = strlen(token);
+ return memlen == len && fast_memeq(mem, token, len);
+}
+
/** Helper function: read the next token from *s, advance *s to the end of the
* token, and return the parsed token. Parse *s according to the list
* of tokens in table.
@@ -290,7 +301,7 @@ get_next_token(memarea_t *area,
next = find_whitespace_eos(*s, eol);
- if (!strcmp_len(*s, "opt", next-*s)) {
+ if (mem_eq_token(*s, next-*s, "opt")) {
/* Skip past an "opt" at the start of the line. */
*s = eat_whitespace_eos_no_nl(next, eol);
next = find_whitespace_eos(*s, eol);
@@ -301,7 +312,7 @@ get_next_token(memarea_t *area,
/* Search the table for the appropriate entry. (I tried a binary search
* instead, but it wasn't any faster.) */
for (i = 0; table[i].t ; ++i) {
-if (!strcmp_len(*s, table[i].t, next-*s)) {
+if (mem_eq_token(*s, next-*s, table[i].t)) {
/* We've found the keyword. */
kwd = table[i].t;
tok->tp = table[i].v;
@@ -354,7 +365,7 @@ get_next_token(memarea_t *area,
obstart = *s; /* Set obstart to start of object spec */
if (eol - *s <= 16 || memchr(*s+11,'\0',eol-*s-16) || /* no short lines, */
- strcmp_len(eol-5, "-", 5) || /* nuls or invalid endings */
+ !mem_eq_token(eol-5, 5, "-") || /* nuls or invalid endings */
(eol-*s) > MAX_UNPARSED_OBJECT_SIZE) { /* name too long */
RET_ERR("Malformed object: bad begin line");
}
@@ -373,8 +384,8 @@ get_next_token(memarea_t *area,
eol = eos;
/* Validate the ending tag, which should be 9 + NAME + 5 + eol */
if ((size_t)(eol-next) != 9+obname_len+5 ||
- strcmp_len(next+9, tok->object_type, obname_len) ||
- strcmp_len(eol-5, "-", 5)) {
+ !mem_eq_token(next+9, obname_len, tok->object_type) ||
+ !mem_eq_token(eol-5, 5, "-")) {
tor_snprintf(ebuf, sizeof(ebuf), "Malformed object: mismatched end tag %s",
tok->object_type);
ebuf[sizeof(ebuf)-1] = '\0';
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 41395f53c6002ee50be3b11c8cb803570d15451c Author: Translation commit bot Date: Wed Jan 9 13:45:54 2019 + Update translations for liveusb-creator --- ro/ro.po | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 3679d2310..4e8a43225 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-09 13:15+\n" +"PO-Revision-Date: 2019-01-09 13:25+\n" "Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" @@ -372,7 +372,7 @@ msgstr "VÄ rugÄm sÄ selectaÈi o imagine Tails în format ISO." #: ../tails_installer/gui.py:572 msgid "No device suitable to install Tails could be found" -msgstr "Niciun dispozitiv compatibil pentru a instala Tails nu a putut fi gÄsit" +msgstr "Nu a putut fi gÄsit nici un dispozitiv compatibil pentru a instala Tails" #: ../tails_installer/gui.py:574 #, python-format @@ -399,7 +399,7 @@ msgstr "Dispozitivul \"%(pretty_name)s\" are prea puÈinÄ memorie liberÄ pentr msgid "" "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\n" "https://tails.boum.org/install/download; -msgstr "To upgrade device \"%(pretty_name)s\" din acest Tails. va fi nevoie sÄ descÄrcaÈi imaginea Tails ISO:\nhttps://tails.boum.org/install/download; +msgstr "Pentru a actualiza dispozitivul \"%(pretty_name)s\" din acest Tails, este nevoie sÄ descÄrcaÈi imaginea Tails ISO:\nhttps://tails.boum.org/install/download; #: ../tails_installer/gui.py:652 msgid "An error happened while installing Tails" @@ -423,11 +423,11 @@ msgstr "Anulare" #: ../tails_installer/gui.py:774 msgid "Unable to mount device" -msgstr "Nu pot monta aparatul" +msgstr "Nu se poate monta dispozitivul" #: ../tails_installer/gui.py:781 ../tails_installer/gui.py:814 msgid "Confirm the target USB stick" -msgstr "Confirm stick-ul USB de destinaÈie" +msgstr "ConfirmaÈi stick-ul USB de destinaÈie" #: ../tails_installer/gui.py:782 #, python-format @@ -447,7 +447,7 @@ msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "\n\nSpaÈiul de pe acest stick USB va fi prezervat. " +msgstr "\n\nStocarea persistentÄ de pe acest stick USB va fi prezervatÄ. " #: ../tails_installer/gui.py:810 #, python-format @@ -464,7 +464,7 @@ msgstr "DescÄrcare eÈuatÄ!" #: ../tails_installer/gui.py:858 msgid "You can try again to resume your download" -msgstr "PuteÈi sÄ reîncercaÈi sÄ reporniÈi downloadul" +msgstr "PuteÈi reîncerca sÄ reporniÈi descÄrcarea" #: ../tails_installer/gui.py:866 msgid "" @@ -476,12 +476,12 @@ msgstr "FiÈierul ales nu poate fi citit. CorectaÈi accesul sau alegeÈi altul. msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "Nu pot folosi fiÈierul ales. PuteÈi avea mai mult noroc mutînd ISO în folderul rÄdÄcinÄ (ex. C:\\)" +msgstr "FiÈierul ales nu poate fi folosit. Poate veÈi avea mai mult noroc mutînd ISO-ul în folderul rÄdÄcinÄ (ex. C:\\)" #: ../tails_installer/gui.py:878 #, python-format msgid "%(filename)s selected" -msgstr "%(filename)s ales" +msgstr "%(filename)s selectat" #: ../tails_installer/source.py:28 msgid "Unable to find LiveOS on ISO" @@ -490,7 +490,7 @@ msgstr "LiveOS nu a fost gÄsit în fiÈierul ISO" #: ../tails_installer/source.py:34 #, python-format msgid "Could not guess underlying block device: %s" -msgstr "Nu pot identifica urmÄtorul device: %s" +msgstr "Nu se pot identifica urmÄtorul dispozitiv: %s" #: ../tails_installer/source.py:49 #, python-format @@ -508,12 +508,12 @@ msgstr "â%sâ nu existÄ" #: ../tails_installer/source.py:65 #, python-format msgid "'%s' is not a directory" -msgstr "â%sâ nu este un dosar" +msgstr "â%sâ nu este un folder" #: ../tails_installer/source.py:75 #, python-format msgid "Skipping '%(filename)s'" -msgstr "Sari peste '%(filename)s'" +msgstr "Se ignorÄ '%(filename)s'" #: ../tails_installer/utils.py:44 #, python-format ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit d8e61cb64502ee1f81824907bca420df43ddfb43 Author: Translation commit bot Date: Wed Jan 9 13:45:46 2019 + Update translations for https_everywhere_completed --- tr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd index 10ea0be77..19603739c 100644 --- a/tr/https-everywhere.dtd +++ b/tr/https-everywhere.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/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit 17bd5180f3712f3b1373c9bd5d682a8afda4c12c Author: Translation commit bot Date: Wed Jan 9 13:46:00 2019 + Update translations for liveusb-creator_completed --- ro/ro.po | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 3679d2310..4e8a43225 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-09 13:15+\n" +"PO-Revision-Date: 2019-01-09 13:25+\n" "Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" @@ -372,7 +372,7 @@ msgstr "VÄ rugÄm sÄ selectaÈi o imagine Tails în format ISO." #: ../tails_installer/gui.py:572 msgid "No device suitable to install Tails could be found" -msgstr "Niciun dispozitiv compatibil pentru a instala Tails nu a putut fi gÄsit" +msgstr "Nu a putut fi gÄsit nici un dispozitiv compatibil pentru a instala Tails" #: ../tails_installer/gui.py:574 #, python-format @@ -399,7 +399,7 @@ msgstr "Dispozitivul \"%(pretty_name)s\" are prea puÈinÄ memorie liberÄ pentr msgid "" "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\n" "https://tails.boum.org/install/download; -msgstr "To upgrade device \"%(pretty_name)s\" din acest Tails. va fi nevoie sÄ descÄrcaÈi imaginea Tails ISO:\nhttps://tails.boum.org/install/download; +msgstr "Pentru a actualiza dispozitivul \"%(pretty_name)s\" din acest Tails, este nevoie sÄ descÄrcaÈi imaginea Tails ISO:\nhttps://tails.boum.org/install/download; #: ../tails_installer/gui.py:652 msgid "An error happened while installing Tails" @@ -423,11 +423,11 @@ msgstr "Anulare" #: ../tails_installer/gui.py:774 msgid "Unable to mount device" -msgstr "Nu pot monta aparatul" +msgstr "Nu se poate monta dispozitivul" #: ../tails_installer/gui.py:781 ../tails_installer/gui.py:814 msgid "Confirm the target USB stick" -msgstr "Confirm stick-ul USB de destinaÈie" +msgstr "ConfirmaÈi stick-ul USB de destinaÈie" #: ../tails_installer/gui.py:782 #, python-format @@ -447,7 +447,7 @@ msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "\n\nSpaÈiul de pe acest stick USB va fi prezervat. " +msgstr "\n\nStocarea persistentÄ de pe acest stick USB va fi prezervatÄ. " #: ../tails_installer/gui.py:810 #, python-format @@ -464,7 +464,7 @@ msgstr "DescÄrcare eÈuatÄ!" #: ../tails_installer/gui.py:858 msgid "You can try again to resume your download" -msgstr "PuteÈi sÄ reîncercaÈi sÄ reporniÈi downloadul" +msgstr "PuteÈi reîncerca sÄ reporniÈi descÄrcarea" #: ../tails_installer/gui.py:866 msgid "" @@ -476,12 +476,12 @@ msgstr "FiÈierul ales nu poate fi citit. CorectaÈi accesul sau alegeÈi altul. msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "Nu pot folosi fiÈierul ales. PuteÈi avea mai mult noroc mutînd ISO în folderul rÄdÄcinÄ (ex. C:\\)" +msgstr "FiÈierul ales nu poate fi folosit. Poate veÈi avea mai mult noroc mutînd ISO-ul în folderul rÄdÄcinÄ (ex. C:\\)" #: ../tails_installer/gui.py:878 #, python-format msgid "%(filename)s selected" -msgstr "%(filename)s ales" +msgstr "%(filename)s selectat" #: ../tails_installer/source.py:28 msgid "Unable to find LiveOS on ISO" @@ -490,7 +490,7 @@ msgstr "LiveOS nu a fost gÄsit în fiÈierul ISO" #: ../tails_installer/source.py:34 #, python-format msgid "Could not guess underlying block device: %s" -msgstr "Nu pot identifica urmÄtorul device: %s" +msgstr "Nu se pot identifica urmÄtorul dispozitiv: %s" #: ../tails_installer/source.py:49 #, python-format @@ -508,12 +508,12 @@ msgstr "â%sâ nu existÄ" #: ../tails_installer/source.py:65 #, python-format msgid "'%s' is not a directory" -msgstr "â%sâ nu este un dosar" +msgstr "â%sâ nu este un folder" #: ../tails_installer/source.py:75 #, python-format msgid "Skipping '%(filename)s'" -msgstr "Sari peste '%(filename)s'" +msgstr "Se ignorÄ '%(filename)s'" #: ../tails_installer/utils.py:44 #, python-format ___ 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 fcff7facbbf2ec46d9891260da9ee8a5291771da Author: Translation commit bot Date: Wed Jan 9 13:45:40 2019 + Update translations for https_everywhere --- tr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd index 8fedaf149..19603739c 100644 --- a/tr/https-everywhere.dtd +++ b/tr/https-everywhere.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/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
commit d8ccaf6080a8a6994c40fdfc0c25f496b827a64f Author: Translation commit bot Date: Wed Jan 9 13:16:45 2019 + Update translations for tails-perl5lib_completed --- ro.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ro.po b/ro.po index 34a981cd7..f16d16176 100644 --- a/ro.po +++ b/ro.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" -"POT-Creation-Date: 2018-08-16 11:11+0200\n" -"PO-Revision-Date: 2018-12-05 23:14+\n" -"Last-Translator: Claudiu Popescu \n" +"POT-Creation-Date: 2019-01-06 16:58+0100\n" +"PO-Revision-Date: 2019-01-09 12:59+\n" +"Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,17 +19,17 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: ../lib/Tails/RunningSystem.pm:190 +#: ../lib/Tails/RunningSystem.pm:193 msgid "Error" msgstr "Eroare" -#: ../lib/Tails/RunningSystem.pm:192 +#: ../lib/Tails/RunningSystem.pm:195 msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" msgstr "Dispozitivul pe care ruleazÄ Tails nu a putut fi gÄsit. AÈi folosit opÈiunea 'toram'?" -#: ../lib/Tails/RunningSystem.pm:220 +#: ../lib/Tails/RunningSystem.pm:223 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib
commit 3abaa197deedf427ba836e15c136fe4a3977a18d Author: Translation commit bot Date: Wed Jan 9 13:16:40 2019 + Update translations for tails-perl5lib --- ro.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ro.po b/ro.po index 34a981cd7..f16d16176 100644 --- a/ro.po +++ b/ro.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" -"POT-Creation-Date: 2018-08-16 11:11+0200\n" -"PO-Revision-Date: 2018-12-05 23:14+\n" -"Last-Translator: Claudiu Popescu \n" +"POT-Creation-Date: 2019-01-06 16:58+0100\n" +"PO-Revision-Date: 2019-01-09 12:59+\n" +"Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,17 +19,17 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: ../lib/Tails/RunningSystem.pm:190 +#: ../lib/Tails/RunningSystem.pm:193 msgid "Error" msgstr "Eroare" -#: ../lib/Tails/RunningSystem.pm:192 +#: ../lib/Tails/RunningSystem.pm:195 msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" msgstr "Dispozitivul pe care ruleazÄ Tails nu a putut fi gÄsit. AÈi folosit opÈiunea 'toram'?" -#: ../lib/Tails/RunningSystem.pm:220 +#: ../lib/Tails/RunningSystem.pm:223 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 5c85b147de971bcf441f6cb1ed3b0085856078c3 Author: Translation commit bot Date: Wed Jan 9 13:15:56 2019 + Update translations for liveusb-creator --- ro/ro.po | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 3441982db..3679d2310 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-09 12:25+\n" +"PO-Revision-Date: 2019-01-09 13:15+\n" "Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" @@ -195,7 +195,7 @@ msgstr "Nu s-a putut gÄsi modulul COM32 â%sâ" #: ../tails_installer/creator.py:1072 ../tails_installer/creator.py:1458 #, python-format msgid "Removing %(file)s" -msgstr "Èterg %(file)s" +msgstr "Se Èterge %(file)s" #: ../tails_installer/creator.py:1186 #, python-format @@ -209,7 +209,7 @@ msgstr "Nu se poate gÄsi partiÈia" #: ../tails_installer/creator.py:1229 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "Formatez %(device)s ca FAT32" +msgstr "Se formateazÄ %(device)s ca FAT32" #: ../tails_installer/creator.py:1289 msgid "Could not find syslinux' gptmbr.bin" @@ -228,11 +228,11 @@ msgstr "Nu s-a putut citi MBR extras din %(path)s" #: ../tails_installer/creator.py:1319 ../tails_installer/creator.py:1320 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "Resetez Master Boot Record al %s" +msgstr "Se reseteazÄ Master Boot Record al %s" #: ../tails_installer/creator.py:1325 msgid "Drive is a loopback, skipping MBR reset" -msgstr "Drive este un loopback, ignor MBR reset" +msgstr "Dispozitivul este de tip loopback, se sare peste resetarea MBR" #: ../tails_installer/creator.py:1329 ../tails_installer/creator.py:1589 #, python-format @@ -241,36 +241,36 @@ msgstr "Se calculeazÄ suma SHA1 a %s" #: ../tails_installer/creator.py:1354 msgid "Synchronizing data on disk..." -msgstr "Sincronizez datele pe disc..." +msgstr "Se sincronizeazÄ datele pe disc..." #: ../tails_installer/creator.py:1397 msgid "Error probing device" -msgstr "Eroare probing device" +msgstr "Eroare la probarea dispozitivului" #: ../tails_installer/creator.py:1399 msgid "Unable to find any supported device" -msgstr "Nu s-a putut gÄsi un dizpozitiv suportat" +msgstr "Nu s-a putut gÄsi un dispozitiv suportat" #: ../tails_installer/creator.py:1409 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "AsiguraÈi-vÄ cÄ cheia USB este pus Èi formatat cu filesystem FAT" +msgstr "AsiguraÈi-vÄ cÄ stick-ul USB este conectat Èi formatat cu sistem de fiÈiere FAT" #: ../tails_installer/creator.py:1412 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." -msgstr "filesystem nesuportat: %s\nFaceÈi backup Èi formataÈi cheia USB cu filesystem FAT." +msgstr "Sistemul de fiÈiere nesuportat: %s\nFaceÈi o copie de rezervÄ Èi formataÈi stick-ul USB cu sistem de fiÈiere FAT." #: ../tails_installer/creator.py:1481 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "Nu pot obÈine Win32_LogicalDisk; win32com query nu a întors nici un rezultat" +msgstr "Nu pot obÈine Win32_LogicalDisk; evaluarea win32com nu a întors nici un rezultat" #: ../tails_installer/creator.py:1536 msgid "Cannot find" -msgstr "Nu gÄsesc" +msgstr "Nu se gÄseÈte" #: ../tails_installer/creator.py:1537 msgid "" @@ -281,18 +281,18 @@ msgstr "AsiguraÈi-vÄ cÄ aÈi extras tot fiÈierul zip tails-installer înaint #: ../tails_installer/gui.py:69 #, python-format msgid "Unknown release: %s" -msgstr "Lansare necunoscutÄ: %s" +msgstr "Versiune necunoscutÄ: %s" #: ../tails_installer/gui.py:73 #, python-format msgid "Downloading %s..." -msgstr "Descarc %s..." +msgstr "Se descarcÄ %s..." #: ../tails_installer/gui.py:213 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "Eroare: Nu pot seta eticheta sau obÈine UUID dispozitivului dumneavoastrÄ. Nu pot continua." +msgstr "Eroare: Nu se poate seta eticheta sau obÈine UUID-ul dispozitivului. Nu se poate continua." #: ../tails_installer/gui.py:260 #, python-format @@ -308,15 +308,15 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "Avertisment: Acest instrument trebuie sÄ fie rulat ca administrator. Pentru a face acest lucru, daÈi clic dreapta pe pictogramÄ Èi deschideÈi ProprietÄÈi. Sub fila Compatibilitate, bifaÈi cÄsuÈa \"RulaÈi acest program ca
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit 501f04cf663055a35e886685b6b118d3be1101d4 Author: Translation commit bot Date: Wed Jan 9 13:16:03 2019 + Update translations for liveusb-creator_completed --- ro/ro.po | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 3441982db..3679d2310 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-09 12:25+\n" +"PO-Revision-Date: 2019-01-09 13:15+\n" "Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" @@ -195,7 +195,7 @@ msgstr "Nu s-a putut gÄsi modulul COM32 â%sâ" #: ../tails_installer/creator.py:1072 ../tails_installer/creator.py:1458 #, python-format msgid "Removing %(file)s" -msgstr "Èterg %(file)s" +msgstr "Se Èterge %(file)s" #: ../tails_installer/creator.py:1186 #, python-format @@ -209,7 +209,7 @@ msgstr "Nu se poate gÄsi partiÈia" #: ../tails_installer/creator.py:1229 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "Formatez %(device)s ca FAT32" +msgstr "Se formateazÄ %(device)s ca FAT32" #: ../tails_installer/creator.py:1289 msgid "Could not find syslinux' gptmbr.bin" @@ -228,11 +228,11 @@ msgstr "Nu s-a putut citi MBR extras din %(path)s" #: ../tails_installer/creator.py:1319 ../tails_installer/creator.py:1320 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "Resetez Master Boot Record al %s" +msgstr "Se reseteazÄ Master Boot Record al %s" #: ../tails_installer/creator.py:1325 msgid "Drive is a loopback, skipping MBR reset" -msgstr "Drive este un loopback, ignor MBR reset" +msgstr "Dispozitivul este de tip loopback, se sare peste resetarea MBR" #: ../tails_installer/creator.py:1329 ../tails_installer/creator.py:1589 #, python-format @@ -241,36 +241,36 @@ msgstr "Se calculeazÄ suma SHA1 a %s" #: ../tails_installer/creator.py:1354 msgid "Synchronizing data on disk..." -msgstr "Sincronizez datele pe disc..." +msgstr "Se sincronizeazÄ datele pe disc..." #: ../tails_installer/creator.py:1397 msgid "Error probing device" -msgstr "Eroare probing device" +msgstr "Eroare la probarea dispozitivului" #: ../tails_installer/creator.py:1399 msgid "Unable to find any supported device" -msgstr "Nu s-a putut gÄsi un dizpozitiv suportat" +msgstr "Nu s-a putut gÄsi un dispozitiv suportat" #: ../tails_installer/creator.py:1409 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "AsiguraÈi-vÄ cÄ cheia USB este pus Èi formatat cu filesystem FAT" +msgstr "AsiguraÈi-vÄ cÄ stick-ul USB este conectat Èi formatat cu sistem de fiÈiere FAT" #: ../tails_installer/creator.py:1412 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." -msgstr "filesystem nesuportat: %s\nFaceÈi backup Èi formataÈi cheia USB cu filesystem FAT." +msgstr "Sistemul de fiÈiere nesuportat: %s\nFaceÈi o copie de rezervÄ Èi formataÈi stick-ul USB cu sistem de fiÈiere FAT." #: ../tails_installer/creator.py:1481 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "Nu pot obÈine Win32_LogicalDisk; win32com query nu a întors nici un rezultat" +msgstr "Nu pot obÈine Win32_LogicalDisk; evaluarea win32com nu a întors nici un rezultat" #: ../tails_installer/creator.py:1536 msgid "Cannot find" -msgstr "Nu gÄsesc" +msgstr "Nu se gÄseÈte" #: ../tails_installer/creator.py:1537 msgid "" @@ -281,18 +281,18 @@ msgstr "AsiguraÈi-vÄ cÄ aÈi extras tot fiÈierul zip tails-installer înaint #: ../tails_installer/gui.py:69 #, python-format msgid "Unknown release: %s" -msgstr "Lansare necunoscutÄ: %s" +msgstr "Versiune necunoscutÄ: %s" #: ../tails_installer/gui.py:73 #, python-format msgid "Downloading %s..." -msgstr "Descarc %s..." +msgstr "Se descarcÄ %s..." #: ../tails_installer/gui.py:213 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "Eroare: Nu pot seta eticheta sau obÈine UUID dispozitivului dumneavoastrÄ. Nu pot continua." +msgstr "Eroare: Nu se poate seta eticheta sau obÈine UUID-ul dispozitivului. Nu se poate continua." #: ../tails_installer/gui.py:260 #, python-format @@ -308,15 +308,15 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "Avertisment: Acest instrument trebuie sÄ fie rulat ca administrator. Pentru a face acest lucru, daÈi clic dreapta pe pictogramÄ Èi deschideÈi ProprietÄÈi. Sub fila Compatibilitate, bifaÈi cÄsuÈa \"RulaÈi acest program ca
[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
commit bb32026086ce6ce08b2d322ee4ced7762f604b64 Author: Translation commit bot Date: Wed Jan 9 12:48:55 2019 + Update translations for torbutton-abouttbupdatedtd_completed --- ro/abouttbupdate.dtd | 10 ++ 1 file changed, 10 insertions(+) diff --git a/ro/abouttbupdate.dtd b/ro/abouttbupdate.dtd new file mode 100644 index 0..e1fb5ade8 --- /dev/null +++ b/ro/abouttbupdate.dtd @@ -0,0 +1,10 @@ + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
commit 375869e6795bf451f5b1c8e2acf9c87da4aea46b Author: Translation commit bot Date: Wed Jan 9 12:48:49 2019 + Update translations for torbutton-abouttbupdatedtd --- ro/abouttbupdate.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ro/abouttbupdate.dtd b/ro/abouttbupdate.dtd index 10b0ec632..e1fb5ade8 100644 --- a/ro/abouttbupdate.dtd +++ b/ro/abouttbupdate.dtd @@ -5,6 +5,6 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit cb2377c83d1a0152f1da20f0b89aaa3fb1fb850a Author: Translation commit bot Date: Wed Jan 9 12:45:58 2019 + Update translations for liveusb-creator_completed --- ro/ro.po | 169 ++- 1 file changed, 90 insertions(+), 79 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index acfd0c45e..3441982db 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# A C , 2019 # axel_89, 2015 # Claudiu Popescu , 2018 # icet208 , 2014 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-20 12:34+0200\n" -"PO-Revision-Date: 2018-12-05 22:53+\n" -"Last-Translator: Claudiu Popescu \n" +"POT-Creation-Date: 2019-01-02 09:26+0100\n" +"PO-Revision-Date: 2019-01-09 12:25+\n" +"Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,12 +32,12 @@ msgstr "Trebuie sÄ rulaÈi aplicaÈia ca root" #: ../tails_installer/creator.py:146 msgid "Extracting live image to the target device..." -msgstr "Extrag imagine live pe deviceul ÈintÄ..." +msgstr "Se extrage imaginea live pe dispozitivul ÈintÄ..." #: ../tails_installer/creator.py:153 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "Scriu la %(speed)d MB/sec" +msgstr "Se scrie pe dispozitiv la %(speed)d MB/sec" #: ../tails_installer/creator.py:296 #, python-format @@ -47,112 +48,112 @@ msgstr "A fost o problemÄ cu execuÈia urmÄtoarei comenzi: `%(command)s`.\nO e #: ../tails_installer/creator.py:315 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "Verific SHA1 checksum a imaginii LiveCD..." +msgstr "Se verificÄ suma de integritate SHA1 a imaginii LiveCD..." #: ../tails_installer/creator.py:319 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "Verific SHA256 checksum a imaginii LiveCD..." +msgstr "Se verificÄ suma de integritate SHA256 a imaginii LiveCD..." #: ../tails_installer/creator.py:335 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "Eroare: SHA1 a Live CD este invalidÄ. PuteÈi rula acest program cu argumentul --noverify pentru a trece de aceastÄ verificare." +msgstr "Eroare: Suma de integritate SHA1 a CD-ului Live este invalidÄ. PuteÈi rula acest program cu argumentul --noverify pentru a trece peste aceastÄ verificare." #: ../tails_installer/creator.py:341 msgid "Unknown ISO, skipping checksum verification" -msgstr "ISO necunoscut, trec de verificarea checksum" +msgstr "ISO necunoscut, se trece peste verificarea sumei de integritate" #: ../tails_installer/creator.py:353 #, python-format msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "Nu este suficient spaÈiu liber pe device.\n%dMB ISO + %dMB overlay > %dMB spaÈiu liber" +msgstr "Nu este suficient spaÈiu liber pe dispozitiv.\n%dMB ISO + %dMB overlay > %dMB spaÈiu liber" #: ../tails_installer/creator.py:360 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "Creez %sMB de overlay persistent" +msgstr "Se creeazÄ %sMB de overlay persistent" #: ../tails_installer/creator.py:421 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "Nu pot copia %(infile)s la %(outfile)s: %(message)s" +msgstr "Nu se poate copia %(infile)s la %(outfile)s: %(message)s" #: ../tails_installer/creator.py:435 msgid "Removing existing Live OS" -msgstr "Èterg Live OS existent" +msgstr "Se Èterge Live OS existent" #: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "Nu pot chmod %(file)s: %(message)s" +msgstr "Nu se poate executa chmod %(file)s: %(message)s" #: ../tails_installer/creator.py:450 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "Nu pot Èterge fiÈier din fostul LiveOS: %(message)s" +msgstr "Nu se poate Èterge fiÈier din fostul LiveOS: %(message)s" #: ../tails_installer/creator.py:464 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "Nu pot sterge folder din fostul LiveOS: %(message)s" +msgstr "Nu se poate Èterge folder din fostul LiveOS: %(message)s" #: ../tails_installer/creator.py:512 #, python-format msgid "Cannot find device %s" -msgstr "Nu gÄsesc device %s" +msgstr "Nu se gÄseÈte dispozitivul %s" #: ../tails_installer/creator.py:713 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "Nu pot scrie pe %(device)s, ignor." +msgstr "Nu se poate scrie pe %(device)s, ignor." #: ../tails_installer/creator.py:743 #,
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 825e94e58529f04a0b6e69462d05ec21c9fd686d Author: Translation commit bot Date: Wed Jan 9 12:45:52 2019 + Update translations for liveusb-creator --- ro/ro.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 0c0028fc2..3441982db 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-09 12:14+\n" +"PO-Revision-Date: 2019-01-09 12:25+\n" "Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" @@ -322,7 +322,7 @@ msgstr "Instalatorul Tails este învechit" msgid "" "To install a new Tails, see the installation documentation.\n" "To upgrade an existing Tails, see the upgrade documentation." -msgstr "" +msgstr "Pentru a crea o instalaÈie Tails nouÄ, vezi documentaÈia de instalare.\nPentru a actualiza o instalaÈie Tails existentÄ, vezi documentaÈia de actualizare." #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" @@ -392,7 +392,7 @@ msgstr "Stick-ul USB \"%(pretty_name)s\" este configurat ca inamovibil de cÄtre msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." -msgstr "Dispozitivul \"%(pretty_name)s\" are prea putina memorie libera pentru a instala Tails (cel putin %(size)s GB este necesar)" +msgstr "Dispozitivul \"%(pretty_name)s\" are prea puÈinÄ memorie liberÄ pentru a instala Tails (cel puÈin %(size)s GB este necesar)" #: ../tails_installer/gui.py:631 #, python-format @@ -403,11 +403,11 @@ msgstr "To upgrade device \"%(pretty_name)s\" din acest Tails. va fi nevoie sÄ #: ../tails_installer/gui.py:652 msgid "An error happened while installing Tails" -msgstr "A apÄrut o eroare la instalarea Tails. " +msgstr "S-a produs o eroare la instalarea Tails. " #: ../tails_installer/gui.py:664 msgid "Refreshing releases..." -msgstr "ÃmprospÄtez versiunile..." +msgstr "Se actualizeazÄ versiunile..." #: ../tails_installer/gui.py:669 msgid "Releases updated!" @@ -415,11 +415,11 @@ msgstr "Versiuni actualizate!" #: ../tails_installer/gui.py:722 msgid "Installation complete!" -msgstr "Instalare completa!" +msgstr "Instalare completÄ!" #: ../tails_installer/gui.py:738 msgid "Cancel" -msgstr "An" +msgstr "Anulare" #: ../tails_installer/gui.py:774 msgid "Unable to mount device" @@ -524,7 +524,7 @@ msgstr "A fost o problemÄ Ã®n execuÈia `%s`.%s\n%s" #: ../tails_installer/utils.py:124 msgid "Could not open device for writing." -msgstr "Nu pot deschide dispozitivul pentru a scrie informaÈia." +msgstr "Nu se poate deschide dispozitivul pentru a scrie informaÈia." #: ../data/tails-installer.ui.h:4 msgid "Select a distribution to download:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 10d56c988c01f7dd0f4062b2fd124d19971a444e Author: Translation commit bot Date: Wed Jan 9 12:15:55 2019 + Update translations for liveusb-creator --- ro/ro.po | 54 +++--- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index c77f28a26..0c0028fc2 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-09 11:45+\n" +"PO-Revision-Date: 2019-01-09 12:14+\n" "Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" @@ -83,77 +83,77 @@ msgstr "Nu se poate copia %(infile)s la %(outfile)s: %(message)s" #: ../tails_installer/creator.py:435 msgid "Removing existing Live OS" -msgstr "Èterg Live OS existent" +msgstr "Se Èterge Live OS existent" #: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "Nu pot chmod %(file)s: %(message)s" +msgstr "Nu se poate executa chmod %(file)s: %(message)s" #: ../tails_installer/creator.py:450 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "Nu pot Èterge fiÈier din fostul LiveOS: %(message)s" +msgstr "Nu se poate Èterge fiÈier din fostul LiveOS: %(message)s" #: ../tails_installer/creator.py:464 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "Nu pot sterge folder din fostul LiveOS: %(message)s" +msgstr "Nu se poate Èterge folder din fostul LiveOS: %(message)s" #: ../tails_installer/creator.py:512 #, python-format msgid "Cannot find device %s" -msgstr "Nu gÄsesc device %s" +msgstr "Nu se gÄseÈte dispozitivul %s" #: ../tails_installer/creator.py:713 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "Nu pot scrie pe %(device)s, ignor." +msgstr "Nu se poate scrie pe %(device)s, ignor." #: ../tails_installer/creator.py:743 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "Anumite partiÈii ale device ÈintÄ %(device)s sînt montate. Ele vor fi demontate înainte de începerea instalÄrii." +msgstr "Anumite partiÈii ale dispozitivului ÈintÄ %(device)s sunt montate. Ele vor fi demontate înainte de începerea instalÄrii." #: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "filesystem necunoscut. Aparatul ar putea sÄ aibÄ nevoie sÄ fie reformatat." +msgstr "Sistem de fiÈiere necunoscut. Dispozitivul poate avea nevoie de a fi reformatat." #: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013 #, python-format msgid "Unsupported filesystem: %s" -msgstr "filesystem nesuportat: %s" +msgstr "Sistem de fiÈiere nesuportat: %s" #: ../tails_installer/creator.py:807 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" -msgstr "ExcepÈie GLib necunoscutÄ la încercarea de a emula dispozitivul: %(message)s" +msgstr "ExcepÈie GLib necunoscutÄ la încercarea de a monta dispozitivul: %(message)s" #: ../tails_installer/creator.py:812 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "Nu pot monta device: %(message)s" +msgstr "Nu se poate monta dispozitivul: %(message)s" #: ../tails_installer/creator.py:817 msgid "No mount points found" -msgstr "Nu am gÄsit puncte de montare" +msgstr "Nu s-au gÄsit puncte de montare" #: ../tails_installer/creator.py:828 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "Introduc unmount_device pentru '%(device)s'" +msgstr "Se executÄ unmount_device pentru '%(device)s'" #: ../tails_installer/creator.py:838 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "Demontez filesystems montat pe '%(device)s'" +msgstr "Se demonteazÄ sistemul de fiÈiere montat pe '%(device)s'" #: ../tails_installer/creator.py:842 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "Demontez '%(udi)s' pe '%(device)s'" +msgstr "Se demontezÄ'%(udi)s' pe '%(device)s'" #: ../tails_installer/creator.py:853 #, python-format @@ -163,34 +163,34 @@ msgstr "Montarea %s existÄ dupÄ demontare" #: ../tails_installer/creator.py:866 #, python-format msgid "Partitioning device %(device)s" -msgstr "PartiÈionez device %(device)s" +msgstr "Se partiÈionezÄ dispozitivul %(device)s" #: ../tails_installer/creator.py:995 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "Device nesuportat '%(device)s', raportaÈi un bug." +msgstr "Dispozitiv nesuportat '%(device)s', raportaÈi un bug."
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit efea2fc4e90c2c829a8b0d7c0f34611efd6e8ddc Author: Translation commit bot Date: Wed Jan 9 11:45:48 2019 + Update translations for liveusb-creator --- ro/ro.po | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 94e6bda63..c77f28a26 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# A C , 2019 # axel_89, 2015 # Claudiu Popescu , 2018 # icet208 , 2014 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-02 13:32+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2019-01-09 11:45+\n" +"Last-Translator: A C \n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,12 +32,12 @@ msgstr "Trebuie sÄ rulaÈi aplicaÈia ca root" #: ../tails_installer/creator.py:146 msgid "Extracting live image to the target device..." -msgstr "Extrag imagine live pe deviceul ÈintÄ..." +msgstr "Se extrage imaginea live pe dispozitivul ÈintÄ..." #: ../tails_installer/creator.py:153 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "Scriu la %(speed)d MB/sec" +msgstr "Se scrie pe dispozitiv la %(speed)d MB/sec" #: ../tails_installer/creator.py:296 #, python-format @@ -47,38 +48,38 @@ msgstr "A fost o problemÄ cu execuÈia urmÄtoarei comenzi: `%(command)s`.\nO e #: ../tails_installer/creator.py:315 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "Verific SHA1 checksum a imaginii LiveCD..." +msgstr "Se verificÄ suma de integritate SHA1 a imaginii LiveCD..." #: ../tails_installer/creator.py:319 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "Verific SHA256 checksum a imaginii LiveCD..." +msgstr "Se verificÄ suma de integritate SHA256 a imaginii LiveCD..." #: ../tails_installer/creator.py:335 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "Eroare: SHA1 a Live CD este invalidÄ. PuteÈi rula acest program cu argumentul --noverify pentru a trece de aceastÄ verificare." +msgstr "Eroare: Suma de integritate SHA1 a CD-ului Live este invalidÄ. PuteÈi rula acest program cu argumentul --noverify pentru a trece peste aceastÄ verificare." #: ../tails_installer/creator.py:341 msgid "Unknown ISO, skipping checksum verification" -msgstr "ISO necunoscut, trec de verificarea checksum" +msgstr "ISO necunoscut, se trece peste verificarea sumei de integritate" #: ../tails_installer/creator.py:353 #, python-format msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "Nu este suficient spaÈiu liber pe device.\n%dMB ISO + %dMB overlay > %dMB spaÈiu liber" +msgstr "Nu este suficient spaÈiu liber pe dispozitiv.\n%dMB ISO + %dMB overlay > %dMB spaÈiu liber" #: ../tails_installer/creator.py:360 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "Creez %sMB de overlay persistent" +msgstr "Se creeazÄ %sMB de overlay persistent" #: ../tails_installer/creator.py:421 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "Nu pot copia %(infile)s la %(outfile)s: %(message)s" +msgstr "Nu se poate copia %(infile)s la %(outfile)s: %(message)s" #: ../tails_installer/creator.py:435 msgid "Removing existing Live OS" ___ 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 4745d167248daebd202193f596fbd025ef353572 Author: Translation commit bot Date: Wed Jan 9 11:15:41 2019 + Update translations for https_everywhere --- ro/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/https-everywhere.dtd b/ro/https-everywhere.dtd index 2e1c647d9..bc1791fe7 100644 --- a/ro/https-everywhere.dtd +++ b/ro/https-everywhere.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/https_everywhere_completed] Update translations for https_everywhere_completed
commit f97e5f2ed2c8bfccf38b9469a84c82293345d905 Author: Translation commit bot Date: Wed Jan 9 11:15:47 2019 + Update translations for https_everywhere_completed --- ro/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/https-everywhere.dtd b/ro/https-everywhere.dtd index dd4350497..bc1791fe7 100644 --- a/ro/https-everywhere.dtd +++ b/ro/https-everywhere.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/support-portal] Update translations for support-portal
commit 6007af7aacf1db390273c53a59e2ecf907e83050 Author: Translation commit bot Date: Wed Jan 9 08:49:40 2019 + Update translations for support-portal --- contents+pl.po | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contents+pl.po b/contents+pl.po index c0cc3ee3b..6c1cfa44a 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -2,6 +2,7 @@ # hoek , 2018 # erinm, 2018 # Filip , 2018 +# Dominik Adrian Grzywak, 2019 # msgid "" msgstr "" @@ -9,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-30 10:36+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: Filip , 2018\n" +"Last-Translator: Dominik Adrian Grzywak, 2019\n" "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -763,7 +764,7 @@ msgstr "" #: http//localhost/tbb/is-there-support-for-bsd/ #: (content/tbb/tbb-18/contents+en.lrquestion.title) msgid "Is there support for *BSD?" -msgstr "" +msgstr "Czy jest wsparcie dla *BSD?" #: http//localhost/tbb/is-there-support-for-bsd/ #: (content/tbb/tbb-18/contents+en.lrquestion.description) @@ -771,6 +772,7 @@ msgid "" "Sorry, but there is currently no official support for running Tor Browser on" " *BSD." msgstr "" +"Niestety, obecnie nie ma oficjalnego wsparcia PrzeglÄ darki Tor dla *BSD." #: http//localhost/tbb/is-there-support-for-bsd/ #: (content/tbb/tbb-18/contents+en.lrquestion.description) @@ -779,11 +781,13 @@ msgid "" "href=\"https://www.torbsd.org/\;>TorBSD project, but their Tor " "Browser is not officially supported." msgstr "" +"Jest coÅ takiego jak https://www.torbsd.org/\;>projekt " +"TorBSD, ale ich PrzeglÄ darka Tor nie jest oficjalnie wspierana." #: http//localhost/tbb/is-there-support-for-bsd/ #: (content/tbb/tbb-18/contents+en.lrquestion.seo_slug) msgid "is-there-support-for-bsd" -msgstr "" +msgstr "is-there-support-for-bsd" #: http//localhost/tbb/cannot-connect-to-tor-browser-network-censored/ #: (content/tbb/tbb-19/contents+en.lrquestion.title) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit ff1ff4b0c3dc4546b7daaf9eb3a4883bf22c8c5c
Author: Translation commit bot
Date: Wed Jan 9 08:45:55 2019 +
Update translations for liveusb-creator_completed
---
pl/pl.po | 825 +--
1 file changed, 377 insertions(+), 448 deletions(-)
diff --git a/pl/pl.po b/pl/pl.po
index c59b0c761..bfaf57d75 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -5,612 +5,541 @@
# Translators:
# Adam Stachowicz , 2015
# agilob, 2013
+# Agnieszka Krakowinska, 2018
# Aron , 2014
+# Ashirat Nessa , 2017-2018
# bogdrozd , 2013
+# hoek , 2017
+# Dominik Adrian Grzywak, 2019
# EJI , 2013
# EJI , 2013
+# hoek , 2018
+# makabi-pl , 2018
# Piotr DrÄ
g , 2008
# sebx, 2013-2015
# sebx, 2015
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-03-21 16:31+\n"
-"Last-Translator: sebx\n"
+"POT-Creation-Date: 2019-01-02 09:26+0100\n"
+"PO-Revision-Date: 2019-01-09 08:34+\n"
+"Last-Translator: Dominik Adrian Grzywak\n"
"Language-Team: Polish
(http://www.transifex.com/otf/torproject/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10
|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) &&
(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 &&
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-#: ../liveusb/gui.py:451
-msgid "\"Clone & Install\""
-msgstr "\"Klonuj i instaluj\""
-
-#: ../liveusb/gui.py:453
-msgid "\"Install from ISO\""
-msgstr "Instalacja z ISO"
+#: ../tails_installer/creator.py:100
+msgid "You must run this application as root"
+msgstr "TÄ aplikacjÄ można uruchomiÄ tylko jako root"
-#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153
-#, python-format
-msgid "%(distribution)s Installer"
-msgstr "%(distribution)s Instalator"
+#: ../tails_installer/creator.py:146
+msgid "Extracting live image to the target device..."
+msgstr "Wypakowywanie obrazu na wybrane urzÄ
dzenie..."
-#: ../liveusb/gui.py:804
+#: ../tails_installer/creator.py:153
#, python-format
-msgid "%(filename)s selected"
-msgstr "Wybrano %(filename)s"
+msgid "Wrote to device at %(speed)d MB/sec"
+msgstr "Dokonano zapisu na urzÄ
dzeniu z prÄdkoÅciÄ
%(speed)d MB/sec"
-#: ../liveusb/gui.py:424
+#: ../tails_installer/creator.py:296
#, python-format
-msgid "%(size)s %(label)s"
-msgstr "%(size)s %(label)s"
+msgid ""
+"There was a problem executing the following command: `%(command)s`.\n"
+"A more detailed error log has been written to '%(filename)s'."
+msgstr "WystÄ
piÅ problem podczas wykonywania nastÄpujÄ
cego polecenia:
\"%(command)s\"\nBardziej szczegóÅowy dziennik bÅÄdu zostaÅ zapisany do
pliku \"%(filename)s\""
-#: ../liveusb/gui.py:430
-#, python-format
-msgid "%(vendor)s %(model)s (%(details)s) - %(device)s"
-msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+#: ../tails_installer/creator.py:315
+msgid "Verifying SHA1 checksum of LiveCD image..."
+msgstr "Sprawdzanie sumy kontrolnej SHA1 obrazu LiveCD..."
-#: ../liveusb/creator.py:1097
-#, python-format
-msgid "%s already bootable"
-msgstr "%s jest już startowa"
+#: ../tails_installer/creator.py:319
+msgid "Verifying SHA256 checksum of LiveCD image..."
+msgstr "Sprawdzanie sumy kontrolnej SHA256 obrazu LiveCD..."
-#: ../liveusb/launcher_ui.py:160
-msgid ""
-"http://www.w3.org/TR/REC-html40/strict.dtd\;>\n"
-"\n"
-"p, li { white-space: pre-wrap; }\n"
-"\n"
-"Need
help? Read the documentation."
-msgstr "http://www.w3.org/TR/REC-html40/strict.dtd\;>\n\np, li {
white-space: pre-wrap; }\n\nPotrzebujesz pomocy? Przeczytaj dokumentacjÄ."
-
-#: ../liveusb/launcher_ui.py:155
+#: ../tails_installer/creator.py:335
msgid ""
-"\n"
-"Install Tails on another USB stick by copying the Tails system that you
are currently using..\n"
-"\n"
-"The USB stick that you install on is formatted and all data is
lost.\n"
-"\n"
-"The encrypted persistent storage of the Tails USB stick that you are
currently using is not copied.\n"
-"\n"
-""
-msgstr "\nZainstaluj Tails na innym urzÄ
dzeniu USB poprzez
skopiowanie systemu Tails którego obecnie używasz..\n\nUrzÄ
dzenie
USB na którym zainstalujesz Tails zostanie sformatowane i tym samym wszelkie
dane zostanÄ
z niego usuniÄte.\n\nZaszyfrowane pliki na systemie
Tails który obecnie używasz nie zostanÄ
skopiowane.\n\n"
+"Error: The SHA1 of your Live CD is invalid. You can run this program with "
+"the --noverify argument to bypass this verification check."
+msgstr "BÅÄ
d: suma kontrolna SHA1 obrazu Live CD jest nieprawidÅowa. Można
uruchomiÄ ten program za pomocÄ
parametru --noverify, aby obejÅÄ to
sprawdzanie."
-#: ../liveusb/launcher_ui.py:157
-msgid ""
-"\n"
-"Upgrade
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 7d30fbba99659899f89ce8f243ae1a6ae7c9e420 Author: Translation commit bot Date: Wed Jan 9 08:45:48 2019 + Update translations for liveusb-creator --- pl/pl.po | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index 0e7ccc1af..bfaf57d75 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -10,6 +10,7 @@ # Ashirat Nessa , 2017-2018 # bogdrozd , 2013 # hoek , 2017 +# Dominik Adrian Grzywak, 2019 # EJI , 2013 # EJI , 2013 # hoek , 2018 @@ -22,8 +23,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-02 13:32+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2019-01-09 08:34+\n" +"Last-Translator: Dominik Adrian Grzywak\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -321,13 +322,13 @@ msgstr "Instalator Tails" #: ../tails_installer/gui.py:441 msgid "Tails Installer is deprecated" -msgstr "" +msgstr "Instalator Tails jest przestarzaÅy" #: ../tails_installer/gui.py:443 msgid "" "To install a new Tails, see the installation documentation.\n" "To upgrade an existing Tails, see the upgrade documentation." -msgstr "" +msgstr "Aby zainstalowaÄ nowego Tails, zobacz dokumentacjÄ instalacji.\nAby zaktualizowaÄ obecnego Tails, zobacz dokumentacjÄ aktualizacji." #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
