October 2017 - tor-commits - lists.torproject.org

[policies/master] Drop translation from listed repos
by atagar＠torproject.org 01 Oct '17

01 Oct '17

commit fae537884f38c93fe80b296f97ba56cedc371efe Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 1 16:48:38 2017 -0700 Drop translation from listed repos All automated commits. Not useful for our purposes. --- scripts/commit_activity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/commit_activity.py b/scripts/commit_activity.py index ce57ee9..f76462d 100644 --- a/scripts/commit_activity.py +++ b/scripts/commit_activity.py @@ -85,7 +85,7 @@ GIT_REPOS = { 'torperf': 'https://git.torproject.org/torperf.git', 'torsocks': 'https://git.torproject.org/torsocks.git', 'torspec': 'https://git.torproject.org/torspec.git', - 'translation': 'https://git.torproject.org/translation.git', + #'translation': 'https://git.torproject.org/translation.git', # only receives automated commits 'translation-tools': 'https://git.torproject.org/translation-tools.git', 'trunnel': 'https://git.torproject.org/trunnel.git', 'weather': 'https://git.torproject.org/weather.git',

1 0

[policies/master] Note commits-per-repo for individuals
by atagar＠torproject.org 01 Oct '17

01 Oct '17

commit 3b7f94be004ded3e17516835daf3fa3a280b493e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 1 16:46:54 2017 -0700 Note commits-per-repo for individuals Neat to include the repo count for individuals so we can tell where hotspots are... Nick Mathewson (nickm(a)torproject.org) 1666 1580 tor, 78 torspec, 4 chutney, 3 trunnel, 1 fuzzing-corpora Bisaloo (Bisaloo(a)users.noreply.github.com) 710 710 https-everywhere ... --- scripts/commit_activity.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/scripts/commit_activity.py b/scripts/commit_activity.py index eeb5e02..ce57ee9 100644 --- a/scripts/commit_activity.py +++ b/scripts/commit_activity.py @@ -106,12 +106,16 @@ def call(cmd, cwd = None): return stdout.strip() -def print_results(title, authors): +def print_results(title, authors, repo_commits_per_user = None): print('%s:\n' % title) if authors: for author, count in sorted(collections.Counter(authors).items(), key = lambda entry: entry[1], reverse = True): print(' %s: %s' % (author, count)) + + if repo_commits_per_user: + repo_counts = ['%s %s' % (c, r) for (r, c) in sorted(repo_commits_per_user.get(author, {}).items(), key = lambda e: e[1], reverse = True)] + print(' %s' % ', '.join(repo_counts)) else: print(' no activity') @@ -121,7 +125,9 @@ def print_results(title, authors): if not os.path.exists(TMP_DIR): os.mkdir(TMP_DIR) +inactive_repos = [] all_author_emails = [] +repo_commits_per_user = {} # mapping of {user => {repo => count}} for name, repo in sorted(GIT_REPOS.items(), key = lambda entry: entry[0]): repo_path = os.path.join(TMP_DIR, name) @@ -135,6 +141,18 @@ for name, repo in sorted(GIT_REPOS.items(), key = lambda entry: entry[0]): print_results(name, author_emails) all_author_emails += author_emails + for author, count in collections.Counter(author_emails).items(): + repo_commits_per_user.setdefault(author, {})[name] = count + + if not author_emails: + inactive_repos.append(name) + +print('Inactive repositories:\n') + +for repo in inactive_repos: + print(' * %s' % repo) + +print('') -print_results('Total commit counts', all_author_emails) +print_results('Total commit counts', all_author_emails, repo_commits_per_user)

1 0

[nyx/master] Redraw right away when actions are taken
by atagar＠torproject.org 01 Oct '17

01 Oct '17

commit 2f7c528340181b5945e149779f82e46107a64427 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 27 14:16:31 2017 -0700 Redraw right away when actions are taken Unnecessarily providing the 'forced' flag when redrawing can cause screen flickering, but omitting it causes actions to not be visible. For instance, when the relay is inactive changing pages takes seconds to appear. --- nyx/__init__.py | 10 +++++----- nyx/curses.py | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index c134a53..7475878 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -167,8 +167,6 @@ def draw_loop(): stem.util.log.info('nyx started (initialization took %0.1f seconds)' % (time.time() - CONFIG['start_time'])) while not interface._quit: - interface.redraw() - if next_key: key, next_key = next_key, None else: @@ -200,11 +198,13 @@ def draw_loop(): stem.util.log.error('Error detected when reloading tor: %s' % exc.strerror) elif key.match('h'): next_key = nyx.popups.show_help() - else: + elif not key.is_null(): for panel in interface.page_panels(): for keybinding in panel.key_handlers(): keybinding.handle(key) + interface.redraw(force = not key.is_null()) + def nyx_interface(): """ @@ -666,7 +666,7 @@ class Interface(object): for panel in self.page_panels(): panel.redraw() - def redraw(self): + def redraw(self, force = False): """ Renders our displayed content. """ @@ -674,7 +674,7 @@ class Interface(object): occupied = 0 for panel in self.page_panels(): - panel.redraw(force = False, top = occupied) + panel.redraw(force = force, top = occupied) occupied += panel.get_height() def quit(self): diff --git a/nyx/curses.py b/nyx/curses.py index 0caf8f4..73db19e 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -938,6 +938,9 @@ class KeyInput(object): page_up, page_down, and esc. """ + if self.is_null(): + return False + for key in keys: if key in SPECIAL_KEYS: if self._key == SPECIAL_KEYS[key]: @@ -950,6 +953,13 @@ class KeyInput(object): return False + def is_null(self): + """ + True if there wasn't a key event (key_input() timed out). + """ + + return self._key == -1 + def is_scroll(self): """ True if the key is used for scrolling, false otherwise.

1 0

[nyx/master] Lessen overhead of idle daemon panels
by atagar＠torproject.org 01 Oct '17

01 Oct '17

commit e82ed8c543d732e7b56d6db4852753755ddae9b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 28 17:38:41 2017 -0700 Lessen overhead of idle daemon panels Turns out having a daemon panel reacquire a lock every 0.2 seconds is fairly taxing, even if the panel isn't doing anything. That, and having the log panel every 0.3 seconds is kinda silly. This drops the log panel usage when idle by 80% (0.5% to 0.1% on my system). --- nyx/panel/__init__.py | 2 +- nyx/panel/log.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index d575e42..2139634 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -207,7 +207,7 @@ class DaemonPanel(Panel, threading.Thread): if nyx_interface().is_paused() or (time.time() - last_ran) < self._update_rate: with self._pause_condition: if not self._halt: - self._pause_condition.wait(0.2) + self._pause_condition.wait(max(0.2, self._update_rate - 0.01)) continue # done waiting, try again diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 4a6afe3..32cbfef 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -43,7 +43,7 @@ CONFIG = conf.config_dict('nyx', { 'write_logs_to': '', }, conf_handler) -UPDATE_RATE = 0.3 +UPDATE_RATE = 0.7 # The height of the drawn content is estimated based on the last time we redrew # the panel. It's chiefly used for scrolling and the bar indicating its

1 0

[nyx/master] Update graph title more infrequently
by atagar＠torproject.org 01 Oct '17

01 Oct '17

commit 59048949769bb90e3d633215d25f7f3774d16306 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 28 15:21:17 2017 -0700 Update graph title more infrequently There's no point in fetching graph title stats every second. These change on an hourly basis. Caching this and skipping vline when there's nothing to display drops our cpu usage when idle by 70% (from 1% to 0.3% on my system). --- nyx/curses.py | 4 +-- nyx/panel/graph.py | 72 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 73db19e..349572e 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -906,7 +906,7 @@ class _Subwindow(object): char = kwargs.get('char', curses.ACS_HLINE) char = ord(char) if isinstance(char, str) else char - if self.width > x and self.height > y: + if self.width > x and self.height > y and length > 0: try: self._curses_subwindow.hline(max(0, y), max(0, x), char | curses_attr(*attr), min(length, self.width - x)) except: @@ -916,7 +916,7 @@ class _Subwindow(object): char = kwargs.get('char', curses.ACS_VLINE) char = ord(char) if isinstance(char, str) else char - if self.width > x and self.height > y: + if self.width > x and self.height > y and length > 0: try: self._curses_subwindow.vline(max(0, y), max(0, x), char | curses_attr(*attr), min(length, self.height - y)) except: diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index e385fe6..f62ce55 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -50,6 +50,7 @@ PRIMARY_COLOR, SECONDARY_COLOR = GREEN, CYAN ACCOUNTING_RATE = 5 DEFAULT_CONTENT_HEIGHT = 4 # space needed for labeling above and below the graph WIDE_LABELING_GRAPH_COL = 50 # minimum graph columns to use wide spacing for x-axis labels +TITLE_UPDATE_RATE = 30 def conf_handler(key, value): @@ -87,6 +88,41 @@ CONFIG = conf.config_dict('nyx', { }, conf_handler) +def _bandwidth_title_stats(): + controller = tor_controller() + + stats = [] + bw_rate = controller.get_effective_rate(None) + bw_burst = controller.get_effective_rate(None, burst = True) + + if bw_rate and bw_burst: + bw_rate_label = _size_label(bw_rate) + bw_burst_label = _size_label(bw_burst) + + # if both are using rounded values then strip off the '.0' decimal + + if '.0' in bw_rate_label and '.0' in bw_burst_label: + bw_rate_label = bw_rate_label.replace('.0', '') + bw_burst_label = bw_burst_label.replace('.0', '') + + stats.append('limit: %s/s' % bw_rate_label) + stats.append('burst: %s/s' % bw_burst_label) + + my_router_status_entry = nyx.tracker.get_consensus_tracker().my_router_status_entry() + measured_bw = getattr(my_router_status_entry, 'bandwidth', None) + + if measured_bw: + stats.append('measured: %s/s' % _size_label(measured_bw)) + else: + my_server_descriptor = controller.get_server_descriptor(default = None) + observed_bw = getattr(my_server_descriptor, 'observed_bandwidth', None) + + if observed_bw: + stats.append('observed: %s/s' % _size_label(observed_bw)) + + return stats + + class GraphData(object): """ Graphable statistical information. @@ -267,6 +303,7 @@ class BandwidthStats(GraphCategory): def __init__(self, clone = None): GraphCategory.__init__(self, clone) + self._title_last_updated = None if not clone: # fill in past bandwidth information @@ -320,38 +357,9 @@ class BandwidthStats(GraphCategory): ', total: %s' % _size_label(self.secondary.total), ] - controller = tor_controller() - - stats = [] - bw_rate = controller.get_effective_rate(None) - bw_burst = controller.get_effective_rate(None, burst = True) - - if bw_rate and bw_burst: - bw_rate_label = _size_label(bw_rate) - bw_burst_label = _size_label(bw_burst) - - # if both are using rounded values then strip off the '.0' decimal - - if '.0' in bw_rate_label and '.0' in bw_burst_label: - bw_rate_label = bw_rate_label.replace('.0', '') - bw_burst_label = bw_burst_label.replace('.0', '') - - stats.append('limit: %s/s' % bw_rate_label) - stats.append('burst: %s/s' % bw_burst_label) - - my_router_status_entry = nyx.tracker.get_consensus_tracker().my_router_status_entry() - measured_bw = getattr(my_router_status_entry, 'bandwidth', None) - - if measured_bw: - stats.append('measured: %s/s' % _size_label(measured_bw)) - else: - my_server_descriptor = controller.get_server_descriptor(default = None) - observed_bw = getattr(my_server_descriptor, 'observed_bandwidth', None) - - if observed_bw: - stats.append('observed: %s/s' % _size_label(observed_bw)) - - self._title_stats = stats + if not self._title_last_updated or time.time() - self._title_last_updated > TITLE_UPDATE_RATE: + self._title_stats = _bandwidth_title_stats() + self._title_last_updated = time.time() class ConnectionStats(GraphCategory):

1 0

[nyx/master] Replace pause conditionals with sleep
by atagar＠torproject.org 01 Oct '17

01 Oct '17

commit 2bac3dc5831be7ad6219fd915de3656f1bc38437 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 30 12:24:09 2017 -0700 Replace pause conditionals with sleep Threading conditionals are the proper method of doing an interruptable sleep, so nyx can shut down right away when quit. However, each of these conditionals impose a surprisingly high tax in terms of baseline cpu usage. Fully half the cpu when idle is just spent on checking conditionals. Guess they're implemented with some sort of busy puller... We don't need interruptability. It's nice, but having our interface take a fraction of a second is well worth halving our cpu usage. When idle this change drops cpu usage from 2.1% to 1.1% for me. Pause Cpu 0.1s 1.4% 0.2s 1.3% 0.3s 1.2% 0.4s 1.1% 0.5s 1.1% 0.6s 1.1% --- nyx/__init__.py | 6 ++++++ nyx/panel/__init__.py | 18 ++++++++---------- nyx/panel/connection.py | 8 +++----- nyx/tracker.py | 18 ++++++------------ 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 7475878..c326cd3 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -112,6 +112,12 @@ stem.control.CACHEABLE_GETINFO_PARAMS = list(stem.control.CACHEABLE_GETINFO_PARA stem.control.LOG_CACHE_FETCHES = False +# Duration for threads to pause when there's no work left to do. This is a +# compromise - lower means fater shutdown when quit but higher means lower cpu +# usage when running. + +PAUSE_TIME = 0.4 + SCHEMA_VERSION = 2 # version of our scheme, bump this if you change the following SCHEMA = ( 'CREATE TABLE schema(version INTEGER)', diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 2139634..3e1aa61 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -33,7 +33,7 @@ import time import nyx.curses -from nyx import nyx_interface +from nyx import PAUSE_TIME, nyx_interface __all__ = [ 'config', @@ -189,7 +189,6 @@ class DaemonPanel(Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) - self._pause_condition = threading.Condition() self._halt = False # terminates thread if true self._update_rate = update_rate @@ -201,13 +200,14 @@ class DaemonPanel(Panel, threading.Thread): Performs our _update() action at the given rate. """ - last_ran = -1 + last_ran = None while not self._halt: - if nyx_interface().is_paused() or (time.time() - last_ran) < self._update_rate: - with self._pause_condition: - if not self._halt: - self._pause_condition.wait(max(0.2, self._update_rate - 0.01)) + if nyx_interface().is_paused() or (last_ran and time.time() - last_ran < self._update_rate): + sleep_until = last_ran + self._update_rate + 0.1 + + while not self._halt and time.time() < sleep_until: + time.sleep(PAUSE_TIME) continue # done waiting, try again @@ -219,6 +219,4 @@ class DaemonPanel(Panel, threading.Thread): Halts further resolutions and terminates the thread. """ - with self._pause_condition: - self._halt = True - self._pause_condition.notifyAll() + self._halt = True diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 670486c..c172908 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -16,7 +16,7 @@ import nyx.panel import nyx.popups import nyx.tracker -from nyx import nyx_interface, tor_controller +from nyx import PAUSE_TIME, nyx_interface, tor_controller from nyx.curses import WHITE, NORMAL, BOLD, HIGHLIGHT from nyx.menu import MenuItem, Submenu, RadioMenuItem, RadioGroup @@ -472,10 +472,6 @@ class ConnectionPanel(nyx.panel.DaemonPanel): start_time = time.time() while True: - with self._pause_condition: - if not self._halt: - self._pause_condition.wait(0.5) - resolution_count = conn_resolver.run_counter() if resolution_count != 0: @@ -484,6 +480,8 @@ class ConnectionPanel(nyx.panel.DaemonPanel): break elif self._halt: return + else: + time.sleep(PAUSE_TIME) controller = tor_controller() LAST_RETRIEVED_CIRCUITS = controller.get_circuits([]) diff --git a/nyx/tracker.py b/nyx/tracker.py index 9f1d72d..b2190fe 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -60,7 +60,7 @@ import stem.control import stem.descriptor.router_status_entry import stem.util.log -from nyx import tor_controller +from nyx import PAUSE_TIME, tor_controller from stem.util import conf, connection, enum, proc, str_tools, system CONFIG = conf.config_dict('nyx', { @@ -378,7 +378,6 @@ class Daemon(threading.Thread): self._run_counter = 0 # counter for the number of successful runs self._is_paused = False - self._pause_condition = threading.Condition() self._halt = False # terminates thread if true controller = tor_controller() @@ -387,14 +386,11 @@ class Daemon(threading.Thread): def run(self): while not self._halt: - time_since_last_ran = time.time() - self._last_ran + if self._is_paused or time.time() - self._last_ran < self._rate: + sleep_until = self._last_ran + self._rate + 0.1 - if self._is_paused or time_since_last_ran < self._rate: - sleep_duration = max(0.02, self._rate - time_since_last_ran) - - with self._pause_condition: - if not self._halt: - self._pause_condition.wait(sleep_duration) + while not self._halt and time.time() < sleep_until: + time.sleep(PAUSE_TIME) continue # done waiting, try again @@ -465,9 +461,7 @@ class Daemon(threading.Thread): Halts further work and terminates the thread. """ - with self._pause_condition: - self._halt = True - self._pause_condition.notifyAll() + self._halt = True def _tor_status_listener(self, controller, event_type, _): with self._process_lock:

1 0

[nyx/master] Only determine relay ports once
by atagar＠torproject.org 01 Oct '17

01 Oct '17

commit 1f9ef690aadcfd121cbba9a59a65e3bcb6068339 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Sep 29 17:51:04 2017 -0700 Only determine relay ports once No detectable difference when I lack any connections, but constructing this lists with every connection entry is silly (even if it is cached). Constructing a set once instead for constant time lookups. --- nyx/tracker.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nyx/tracker.py b/nyx/tracker.py index 1fbd80e..9f1d72d 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -541,15 +541,15 @@ class ConnectionTracker(Daemon): controller = tor_controller() consensus_tracker = get_consensus_tracker() + relay_ports = set(controller.get_ports(stem.control.Listener.OR, [])) + relay_ports.update(controller.get_ports(stem.control.Listener.DIR, [])) + relay_ports.update(controller.get_ports(stem.control.Listener.CONTROL, [])) + for conn in proc.connections(user = controller.get_user(None)): if conn.remote_port in consensus_tracker.get_relay_fingerprints(conn.remote_address): connections.append(conn) # outbound to another relay - elif conn.local_port in controller.get_ports(stem.control.Listener.OR, []): - connections.append(conn) # inbound to our ORPort - elif conn.local_port in controller.get_ports(stem.control.Listener.DIR, []): - connections.append(conn) # inbound to our DirPort - elif conn.local_port in controller.get_ports(stem.control.Listener.CONTROL, []): - connections.append(conn) # controller connection + elif conn.local_port in relay_ports: + connections.append(conn) else: connections = connection.get_connections(resolver, process_pid = process_pid, process_name = process_name)

1 0

[stem/master] Parse proc connections by index
by atagar＠torproject.org 01 Oct '17

01 Oct '17

commit 8da78a9fadc178e14183ba0a65b9593dcf43b7bb Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 25 22:07:13 2017 -0700 Parse proc connections by index Proc's /proc/net/tcp commonly has thousands of lines on even moderately busy relays. For me it takes about half a second to process, pegging the cpu during that time. After lots of experimenting finally found something to greatly speed this up. Parsing the proc content via index rather than spit makes a large difference. More delicate so this might require some adjustment to accomidate how other platforms format their proc. This is about a 30% improvement, but along with the earlier changes this in total accounts for a 5x speedup in proc conneciton resolution, going from 0.38s to 0.07s for my relay's proc contents. --- docs/change_log.rst | 1 + stem/util/proc.py | 98 +++++++++++++++++++++++++++++++++++--------------- test/unit/util/proc.py | 14 ++++---- 3 files changed, 79 insertions(+), 34 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 415a8bfe..16a16ad7 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -88,6 +88,7 @@ The following are only available within Stem's `git repository * Added round argument to :func:`~stem.util.str_tools.size_label` * Added :class:`~stem.util.test_tools.TimedTestRunner` and :func:`~stem.util.test_tools.test_runtimes` * Supporing pid arguments in :func:`~stem.util.system.is_running` + * Made connection resolution via proc about 5x faster * Normalized :func:`~stem.util.term.format` to return unicode * Don't load vim swap files as configurations diff --git a/stem/util/proc.py b/stem/util/proc.py index 6f00311b..70096a33 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -379,27 +379,70 @@ def connections(pid = None, user = None): continue # ipv6 proc contents are optional protocol = proc_file_path[10:].rstrip('6') # 'tcp' or 'udp' - is_ipv6 = proc_file_path.endswith('6') + is_tcp, is_udp, is_ipv6 = protocol == 'tcp', protocol == 'udp', proc_file_path.endswith('6') + title = '' try: with open(proc_file_path, 'rb') as proc_file: - proc_file.readline() # skip the first line + title = proc_file.readline() + + if 'local_address' in title: + laddr_start = title.index('local_address') + laddr_end = laddr_start + (8 if not is_ipv6 else 32) + + lport_start = laddr_end + 1 + lport_end = lport_start + 4 + else: + raise IOError("title line missing 'local_address', %s" % title) + + if 'rem_address' in title or 'remote_address' in title: + raddr_start = title.index('rem_address') if 'rem_address' in title else title.index('remote_address') + raddr_end = raddr_start + (8 if not is_ipv6 else 32) + + rport_start = raddr_end + 1 + rport_end = rport_start + 4 + else: + raise IOError("title line missing 'remote_address', %s" % title) + + if 'st' in title: + status_start = title.index('st') + status_end = status_start + 2 + else: + raise IOError("title line missing 'st', %s" % title) + + if 'retrnsmt' in title and 'uid' in title: + # unlike the above fields uid is right aligned + uid_start = title.index('retrnsmt') + 9 + uid_end = title.index('uid') + 3 + elif 'retrnsmt' not in title: + raise IOError("title line missing 'retrnsmt', %s" % title) + else: + raise IOError("title line missing 'uid', %s" % title) + + if 'timeout' in title: + # inodes can lack a header, and are a dynamic size + inode_start = title.index('timeout') + 8 + else: + raise IOError("title line missing 'timeout', %s" % title) for line in proc_file: - _, l_addr, f_addr, status, _, _, _, uid, _, inode = line.split()[:10] - - if inodes and inode not in inodes: + if inodes and line[inode_start:].split(' ', 1)[0] not in inodes: continue - elif process_uid and uid != process_uid: + elif process_uid and line[uid_start:uid_end].strip() != process_uid: continue - elif protocol == 'tcp' and status != b'01': + elif is_tcp and line[status_start:status_end] != b'01': continue # skip tcp connections that aren't yet established - elif protocol == 'udp' and (f_addr == '00000000:0000' or f_addr == '00000000000000000000000000000000:0000'): + + l_addr = _unpack_addr(line[laddr_start:laddr_end]) + l_port = int(line[lport_start:lport_end], 16) + + r_addr = _unpack_addr(line[raddr_start:raddr_end]) + r_port = int(line[rport_start:rport_end], 16) + + if is_udp and (r_addr == '0.0.0.0' or r_addr == '0000:0000:0000:0000:0000:0000') and r_port == 0: continue # skip udp connections with a blank destination - local_ip, local_port = _decode_proc_address_encoding(l_addr, is_ipv6) - foreign_ip, foreign_port = _decode_proc_address_encoding(f_addr, is_ipv6) - conn.append(stem.util.connection.Connection(local_ip, local_port, foreign_ip, foreign_port, protocol, is_ipv6)) + conn.append(stem.util.connection.Connection(l_addr, l_port, r_addr, r_port, protocol, is_ipv6)) except IOError as exc: raise IOError("unable to read '%s': %s" % (proc_file_path, exc)) except Exception as exc: @@ -450,7 +493,7 @@ def _inodes_for_sockets(pid): return inodes -def _decode_proc_address_encoding(addr, is_ipv6): +def _unpack_addr(addr): """ Translates an address entry in the /proc/net/* contents to a human readable form (`reference <http://linuxdevcenter.com/pub/a/linux/2000/11/16/LinuxAdmin.html>`_, @@ -458,24 +501,21 @@ def _decode_proc_address_encoding(addr, is_ipv6): :: - "0500000A:0016" -> ("10.0.0.5", 22) - "F804012A4A5190010000000002000000:01BB" -> ("2a01:4f8:190:514a::2", 443) + "0500000A" -> "10.0.0.5" + "F804012A4A5190010000000002000000" -> "2a01:4f8:190:514a::2" :param str addr: proc address entry to be decoded - :param bool is_ipv6: if we should treat the address as ipv6 - :returns: **tuple** of the form **(addr, port)**, with addr as a string and port an int + :returns: **str** of the decoded address """ - ip, port = addr.rsplit(b':', 1) - port = int(port, 16) # the port is represented as a two-byte hexadecimal number - - if ip not in ENCODED_ADDR: - if not is_ipv6: - ip_encoded = base64.b16decode(ip)[::-1] if IS_LITTLE_ENDIAN else base64.b16decode(ip) - ENCODED_ADDR[ip] = socket.inet_ntop(socket.AF_INET, ip_encoded) + if addr not in ENCODED_ADDR: + if len(addr) == 8: + # IPv4 address + decoded = base64.b16decode(addr)[::-1] if IS_LITTLE_ENDIAN else base64.b16decode(addr) + ENCODED_ADDR[addr] = socket.inet_ntop(socket.AF_INET, decoded) else: - ip_encoded = ip + # IPv6 address if IS_LITTLE_ENDIAN: # Group into eight characters, then invert in pairs... @@ -485,14 +525,16 @@ def _decode_proc_address_encoding(addr, is_ipv6): inverted = [] for i in range(4): - grouping = ip[8 * i:8 * (i + 1)] + grouping = addr[8 * i:8 * (i + 1)] inverted += [grouping[2 * i:2 * (i + 1)] for i in range(4)][::-1] - ip_encoded = b''.join(inverted) + encoded = b''.join(inverted) + else: + encoded = addr - ENCODED_ADDR[ip] = stem.util.connection.expand_ipv6_address(socket.inet_ntop(socket.AF_INET6, base64.b16decode(ip_encoded))) + ENCODED_ADDR[addr] = stem.util.connection.expand_ipv6_address(socket.inet_ntop(socket.AF_INET6, base64.b16decode(encoded))) - return (ENCODED_ADDR[ip], port) + return ENCODED_ADDR[addr] def _is_float(*value): diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index a172fcb4..4d9c8ffa 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -16,6 +16,8 @@ try: except ImportError: from mock import Mock, patch +TITLE_LINE = 'sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout' + TCP6_CONTENT = b"""\ sl local_address remote_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode 0: 00000000000000000000000000000000:1495 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 106 0 14347030 1 0000000000000000 100 0 0 10 0 @@ -210,8 +212,8 @@ class TestProc(unittest.TestCase): '/proc/%s/fd/4' % pid: 'pipe:[40404]', }[param] - tcp = b'\n 0: 11111111:1111 22222222:2222 01 44444444:44444444 55:55555555 66666666 1111 8 99999999' - udp = b'\n A: BBBBBBBB:BBBB CCCCCCCC:CCCC DD EEEEEEEE:EEEEEEEE FF:FFFFFFFF GGGGGGGG 1111 H IIIIIIII' + tcp = b'%s\n 0: 11111111:1111 22222222:2222 01 44444444:44444444 55:55555555 66666666 1111 8 99999999' % TITLE_LINE + udp = b'%s\n A: BBBBBBBB:BBBB CCCCCCCC:CCCC DD EEEEEEEE:EEEEEEEE FF:FFFFFFFF GGGGGGGG 1111 H IIIIIIII' % TITLE_LINE path_exists_mock.side_effect = lambda param: { '/proc/net/tcp': True, @@ -258,9 +260,9 @@ class TestProc(unittest.TestCase): }[param] open_mock.side_effect = lambda param, mode: { - '/proc/net/tcp': io.BytesIO(b''), + '/proc/net/tcp': io.BytesIO(TITLE_LINE), '/proc/net/tcp6': io.BytesIO(TCP6_CONTENT), - '/proc/net/udp': io.BytesIO(b''), + '/proc/net/udp': io.BytesIO(TITLE_LINE), }[param] expected_results = [ @@ -286,9 +288,9 @@ class TestProc(unittest.TestCase): }[param] open_mock.side_effect = lambda param, mode: { - '/proc/net/tcp': io.BytesIO(b''), + '/proc/net/tcp': io.BytesIO(TITLE_LINE), '/proc/net/tcp6': io.BytesIO(TCP6_CONTENT), - '/proc/net/udp': io.BytesIO(b''), + '/proc/net/udp': io.BytesIO(TITLE_LINE), }[param] expected_results = [

1 0

[policies/master] Script to determine commit activity
by atagar＠torproject.org 01 Oct '17

01 Oct '17

commit 3c0e758cabcccc099ad5640deca0f75827342591 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 1 16:12:57 2017 -0700 Script to determine commit activity Simple script that pulls all the repositories listed on https://gitweb.torproject.org/ to determine activity in the last six months. --- scripts/commit_activity.py | 140 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/scripts/commit_activity.py b/scripts/commit_activity.py new file mode 100644 index 0000000..eeb5e02 --- /dev/null +++ b/scripts/commit_activity.py @@ -0,0 +1,140 @@ +import collections +import os +import subprocess +import sys + +TMP_DIR = '/tmp/tor_git_repos' + +GIT_REPOS = { + 'anonbib': 'https://git.torproject.org/anonbib.git', + 'atlas': 'https://git.torproject.org/atlas.git', + 'bridgedb': 'https://git.torproject.org/bridgedb.git', + 'builders_gitian-builder': 'https://git.torproject.org/builders/gitian-builder.git', + 'builders_rbm': 'https://git.torproject.org/builders/rbm.git', + 'builders_tor-browser-build': 'https://git.torproject.org/builders/tor-browser-build.git', + 'builders_tor-browser-bundle': 'https://git.torproject.org/builders/tor-browser-bundle.git', + 'censorship-timeline': 'https://git.torproject.org/censorship-timeline.git', + 'check': 'https://git.torproject.org/check.git', + 'chutney': 'https://git.torproject.org/chutney.git', + 'collector': 'https://git.torproject.org/collector.git', + 'community_policies': 'https://git.torproject.org/community/policies.git', + 'company_policies': 'https://git.torproject.org/company/policies.git', + 'compass': 'https://git.torproject.org/compass.git', + 'curriculum': 'https://git.torproject.org/curriculum.git', + 'depictor': 'https://git.torproject.org/depictor.git', + 'doctor': 'https://git.torproject.org/doctor.git', + 'erebus': 'https://git.torproject.org/erebus.git', + 'exonerator': 'https://git.torproject.org/exonerator.git', + 'flashproxy': 'https://git.torproject.org/flashproxy.git', + 'fuzzing-corpora': 'https://git.torproject.org/fuzzing-corpora.git', + 'gettor': 'https://git.torproject.org/gettor.git', + 'githax': 'https://git.torproject.org/githax.git', + 'guardfraction': 'https://git.torproject.org/guardfraction.git', + 'https-everywhere': 'https://git.torproject.org/https-everywhere.git', + 'metrics-base': 'https://git.torproject.org/metrics-base.git', + 'metrics-lib': 'https://git.torproject.org/metrics-lib.git', + 'metrics-tasks': 'https://git.torproject.org/metrics-tasks.git', + 'metrics-web': 'https://git.torproject.org/metrics-web.git', + 'nyx': 'https://git.torproject.org/nyx.git', + 'onionoo': 'https://git.torproject.org/onionoo.git', + 'ooni-probe': 'https://git.torproject.org/ooni-probe.git', + 'oonib': 'https://git.torproject.org/ooni/oonib.git', + 'ooni_reader': 'https://git.torproject.org/ooni/reader.git', + 'ooni_spec': 'https://git.torproject.org/ooni/spec.git', + 'ooni_web': 'https://git.torproject.org/ooni/web.git', + 'orbot': 'https://git.torproject.org/orbot.git', + 'pluggable-transports_bundle': 'https://git.torproject.org/pluggable-transports/bundle.git', + 'pluggable-transports_fog': 'https://git.torproject.org/pluggable-transports/fog.git', + 'pluggable-transports_goptlib': 'https://git.torproject.org/pluggable-transports/goptlib.git', + 'pluggable-transports_meek': 'https://git.torproject.org/pluggable-transports/meek.git', + 'pluggable-transports_obfs4': 'https://git.torproject.org/pluggable-transports/obfs4.git', + 'pluggable-transports_obfsproxy': 'https://git.torproject.org/pluggable-transports/obfsproxy.git', + 'pluggable-transports_obfsproxy-legacy': 'https://git.torproject.org/pluggable-transports/obfsproxy-legacy.git', + 'pluggable-transports_pyptlib': 'https://git.torproject.org/pluggable-transports/pyptlib.git', + 'pluggable-transports_snowflake': 'https://git.torproject.org/pluggable-transports/snowflake.git', + 'pluggable-transports_websocket': 'https://git.torproject.org/pluggable-transports/websocket.git', + 'pups': 'https://git.torproject.org/pups.git', + 'pytorctl': 'https://git.torproject.org/pytorctl.git', + 'research-web': 'https://git.torproject.org/research-web.git', + 'stegotorus': 'https://git.torproject.org/stegotorus.git', + 'stem': 'https://git.torproject.org/stem.git', + 'support-portal': 'https://git.torproject.org/support-portal.git', + 'support-tools': 'https://git.torproject.org/support-tools.git', + 'tech-reports': 'https://git.torproject.org/tech-reports.git', + 'thandy': 'https://git.torproject.org/thandy.git', + 'tor': 'https://git.torproject.org/tor.git', + 'tor-animation': 'https://git.torproject.org/tor-animation.git', + 'tor-blog': 'https://git.torproject.org/tor-blog.git', + 'tor-brochure': 'https://git.torproject.org/tor-brochure.git', + 'tor-browser': 'https://git.torproject.org/tor-browser.git', + 'tor-browser-spec': 'https://git.torproject.org/tor-browser-spec.git', + 'sandboxed-tor-browser': 'https://git.torproject.org/tor-browser/sandboxed-tor-browser.git', + 'user-manual': 'https://git.torproject.org/tor-browser/user-manual.git', + 'tor-design-2012': 'https://git.torproject.org/tor-design-2012.git', + 'tor-fw-helper': 'https://git.torproject.org/tor-fw-helper.git', + 'tor-glossary': 'https://git.torproject.org/tor-glossary.git', + 'tor-launcher': 'https://git.torproject.org/tor-launcher.git', + 'tor-manual': 'https://git.torproject.org/tor-manual.git', + 'tor-messenger-build': 'https://git.torproject.org/tor-messenger-build.git', + 'tor-ramdisk': 'https://git.torproject.org/tor-ramdisk.git', + 'torbirdy': 'https://git.torproject.org/torbirdy.git', + 'torbrowser': 'https://git.torproject.org/torbrowser.git', + 'torbutton': 'https://git.torproject.org/torbutton.git', + 'tordnsel': 'https://git.torproject.org/tordnsel.git', + 'torflow': 'https://git.torproject.org/torflow.git', + 'torperf': 'https://git.torproject.org/torperf.git', + 'torsocks': 'https://git.torproject.org/torsocks.git', + 'torspec': 'https://git.torproject.org/torspec.git', + 'translation': 'https://git.torproject.org/translation.git', + 'translation-tools': 'https://git.torproject.org/translation-tools.git', + 'trunnel': 'https://git.torproject.org/trunnel.git', + 'weather': 'https://git.torproject.org/weather.git', + 'webstats': 'https://git.torproject.org/webstats.git', +} + +def call(cmd, cwd = None): + if isinstance(cmd, str): + cmd = cmd.split() + + process = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, cwd = cwd) + stdout, stderr = process.communicate() + + if process.poll() != 0: + print("'%s' failed:\n\nstdout: %s\n\nstderr: %s" % (' '.join(cmd), stdout, stderr)) + sys.exit(1) + else: + return stdout.strip() + + +def print_results(title, authors): + print('%s:\n' % title) + + if authors: + for author, count in sorted(collections.Counter(authors).items(), key = lambda entry: entry[1], reverse = True): + print(' %s: %s' % (author, count)) + else: + print(' no activity') + + print('') + + +if not os.path.exists(TMP_DIR): + os.mkdir(TMP_DIR) + +all_author_emails = [] + +for name, repo in sorted(GIT_REPOS.items(), key = lambda entry: entry[0]): + repo_path = os.path.join(TMP_DIR, name) + + if os.path.exists(repo_path): + call('git fetch --all', cwd = repo_path) + else: + call('git clone --mirror %s %s' % (repo, name), cwd = TMP_DIR) + + author_emails = call(['git', 'log', '--all', '--since', '-6 month', '--format=%an (%ae)'], cwd = repo_path).splitlines() + print_results(name, author_emails) + all_author_emails += author_emails + + +print_results('Total commit counts', all_author_emails) +

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 01 Oct '17

01 Oct '17

commit 0326cf905321619274483e7a4ddd7a6f0ef1d154 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 1 19:20:49 2017 +0000 Update translations for tor-browser-manual --- he/he.po | 79 ++++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 60 insertions(+), 19 deletions(-) diff --git a/he/he.po b/he/he.po index 25d579fc6..9d12de03a 100644 --- a/he/he.po +++ b/he/he.po @@ -1,15 +1,14 @@ # Translators: # GenghisKhan <genghiskhan(a)gmx.ca>, 2016 -# yael gogol <yaelgogol(a)gmail.com>, 2016 +# ION <zzz_aviv(a)yahoo.com>, 2016 # Johnny Diralenzo <etcjcysu(a)sharklasers.com>, 2016 # Jacob Paikin <jacobpa9(a)gmail.com>, 2016 -# ION <zzz_aviv(a)yahoo.com>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: ION <zzz_aviv(a)yahoo.com>, 2016\n" +"Last-Translator: Jacob Paikin <jacobpa9(a)gmail.com>, 2016\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,11 +19,11 @@ msgstr "" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" -msgstr "קרדיטים למתרגם" +msgstr "IONIL" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" -msgstr "" +msgstr "למד מה דפדפו Tor יכול לעשות כדי להגן על פרטיותך ועל אלמוניותך" #: about-tor-browser.page:10 msgid "About Tor Browser" @@ -125,7 +124,7 @@ msgstr "" #: bridges.page:28 msgid "Getting bridge addresses" -msgstr "" +msgstr "משיג כתובות גשר" #: bridges.page:29 msgid "" @@ -139,6 +138,9 @@ msgid "" "href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" " and follow the instructions, or" msgstr "" +"בקר ב-<link " +"href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" +" ועקוב אחר ההוראות, או" #: bridges.page:42 msgid "" @@ -148,7 +150,7 @@ msgstr "" #: bridges.page:51 msgid "Entering bridge addresses" -msgstr "" +msgstr "מכניס כתובות גשר" #: bridges.page:52 msgid "" @@ -173,6 +175,8 @@ msgid "" "external ref='media/tor-launcher-custom-bridges_en-US.png' " "md5='93365c2aa3fb4d627497e83f28a39b7e'" msgstr "" +"external ref='media/tor-launcher-custom-bridges_en-US.png' " +"md5='93365c2aa3fb4d627497e83f28a39b7e'" #: bridges.page:65 msgid "" @@ -184,7 +188,7 @@ msgstr "" #: circumvention.page:6 msgid "What to do if the Tor network is blocked" -msgstr "" +msgstr "מה לעשות אם רשת Tor חסומה" #: circumvention.page:10 msgid "Circumvention" @@ -202,7 +206,7 @@ msgstr "" #: circumvention.page:22 msgid "Using pluggable transports" -msgstr "" +msgstr "משתמש בתעבורות נתיקות" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -214,6 +218,8 @@ msgid "" "external ref='media/circumvention/configure.png' " "md5='519d888303eadfe4cb03f178aedd90f5'" msgstr "" +"external ref='media/circumvention/configure.png' " +"md5='519d888303eadfe4cb03f178aedd90f5'" #: circumvention.page:28 msgid "" @@ -244,6 +250,8 @@ msgid "" "external ref='media/circumvention/bridges.png' " "md5='910cdd5e45860b81a1ad4739c589a195'" msgstr "" +"external ref='media/circumvention/bridges.png' " +"md5='910cdd5e45860b81a1ad4739c589a195'" #: circumvention.page:51 msgid "" @@ -343,38 +351,45 @@ msgid "" "Message to @get_tor with the words \"osx en\" in it (you don't need to " "follow the account)." msgstr "" +"כדי להשיג קישורים עבור הורדת דפדפן Tor באנגלית עבור OS X, שלח הודעה ישירה אל" +" @get_tor עם המילים \"osx en\" בתוכה (אתה לא צריך לעקוב אחרי החשבון)." #: downloading.page:70 msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" msgstr "" +"כדי להשיג את GetTor באמצעות Jabber/XMPP (כגון Tor Messenger, Jitsi, CoyIM):" #: downloading.page:75 msgid "" "To get links for downloading Tor Browser in Chinese for Linux, send a " "message to gettor(a)torproject.org with the words \"linux zh\" in it." msgstr "" +"כדי להשיג קישורים עבור הורדת דפדפן Tor בסינית עבור לינוקס, שלח הודעה אל " +"gettor(a)torproject.org עם המילים \"linux zh\" בתוכה." #: downloading.page:84 msgid "Satori" -msgstr "" +msgstr "Satori" #: downloading.page:85 msgid "" "Satori is an add-on for the Chrome or Chromium browsers that allows you to " "download several security and privacy programs from different sources." msgstr "" +"Satori הוא תוספת עבור כרום או דפדפני כרומיום המתיר לך להוריד מספר תוכניות של" +" אבטחה ופרטיות ממקורות שונים." #: downloading.page:90 msgid "To download Tor Browser using Satori:" -msgstr "" +msgstr "כדי להוריד את Tor ע\"י שימוש ב-Satori:" #: downloading.page:95 msgid "Install Satori from the Chrome App Store." -msgstr "" +msgstr "התקן את Satori מחנות היישומים של כרום." #: downloading.page:100 msgid "Select Satori from your browser’s Apps menu." -msgstr "" +msgstr "בחר ב-Satori מתוך תפריט היישומים של הדפדפן." #: downloading.page:105 msgid "" @@ -431,6 +446,8 @@ msgid "" "external ref='media/first-time/connect.png' " "md5='9d07068f751a3bfd274365a4ba8d90ca'" msgstr "" +"external ref='media/first-time/connect.png' " +"md5='9d07068f751a3bfd274365a4ba8d90ca'" #: first-time.page:23 msgid "" @@ -483,6 +500,8 @@ msgid "" "external ref='media/first-time/proxy_question.png' " "md5='30853b3e86cfd386bbc32e5b8b45a378'" msgstr "" +"external ref='media/first-time/proxy_question.png' " +"md5='30853b3e86cfd386bbc32e5b8b45a378'" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -494,6 +513,8 @@ msgid "" "external ref='media/first-time/proxy.png' " "md5='13f21a351cd0aa1cf11aada690f3dc90'" msgstr "" +"external ref='media/first-time/proxy.png' " +"md5='13f21a351cd0aa1cf11aada690f3dc90'" #: index.page:6 msgid "Tor Browser User Manual" @@ -632,6 +653,8 @@ msgid "" "external ref='media/managing-identities/circuit_full.png' " "md5='bd46d22de952fee42643be46d3f95928'" msgstr "" +"external ref='media/managing-identities/circuit_full.png' " +"md5='bd46d22de952fee42643be46d3f95928'" #: managing-identities.page:48 msgid "" @@ -696,6 +719,8 @@ msgid "" "external ref='media/managing-identities/new_identity.png' " "md5='15b01e35fa83185d94b57bf0ccf09d76'" msgstr "" +"external ref='media/managing-identities/new_identity.png' " +"md5='15b01e35fa83185d94b57bf0ccf09d76'" #: managing-identities.page:105 msgid "" @@ -788,6 +813,8 @@ msgid "" "external ref='media/onionsites/onion_url.png' " "md5='f97f7fe10f07c3959c4430934974bbaa'" msgstr "" +"external ref='media/onionsites/onion_url.png' " +"md5='f97f7fe10f07c3959c4430934974bbaa'" #: onionsites.page:50 msgid "" @@ -879,6 +906,8 @@ msgid "" "external ref='media/plugins/noscript_menu.png' " "md5='df9e684b76a3c2e2bdcb879a19c20471'" msgstr "" +"external ref='media/plugins/noscript_menu.png' " +"md5='df9e684b76a3c2e2bdcb879a19c20471'" #: plugins.page:47 msgid "" @@ -937,6 +966,8 @@ msgid "" "external ref='media/secure-connections/https.png' " "md5='364bcbde7a649b0cea9ae178007c1a50'" msgstr "" +"external ref='media/secure-connections/https.png' " +"md5='364bcbde7a649b0cea9ae178007c1a50'" #: secure-connections.page:26 msgid "" @@ -1000,7 +1031,7 @@ msgstr "" #: security-slider.page:10 msgid "Security Slider" -msgstr "" +msgstr "מחוון אבטחה" #: security-slider.page:11 msgid "" @@ -1025,6 +1056,8 @@ msgid "" "external ref='media/security-slider/slider.png' " "md5='3c469cd3ed9f60ebb6bbbc63daa90082'" msgstr "" +"external ref='media/security-slider/slider.png' " +"md5='3c469cd3ed9f60ebb6bbbc63daa90082'" #: security-slider.page:25 msgid "" @@ -1046,6 +1079,8 @@ msgid "" "external ref='media/security-slider/slider_window.png' " "md5='c733bdccd1731ed1a772777b25bae7a1'" msgstr "" +"external ref='media/security-slider/slider_window.png' " +"md5='c733bdccd1731ed1a772777b25bae7a1'" #: security-slider.page:36 msgid "" @@ -1105,11 +1140,11 @@ msgstr "" #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" -msgstr "" +msgstr "סוגים של תעבורה נתיקה" #: transports.page:10 msgid "Pluggable Transports" -msgstr "" +msgstr "תעבורות נתיקות" #: transports.page:12 msgid "" @@ -1148,7 +1183,7 @@ msgstr "" #: transports.page:56 msgid "Scramblesuit" -msgstr "" +msgstr "Scramblesuit" #: transports.page:61 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." @@ -1178,7 +1213,7 @@ msgstr "" #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" -msgstr "" +msgstr "מה לעשות אם דפדפן Tor אינו עובד" #: troubleshooting.page:12 msgid "" @@ -1266,7 +1301,7 @@ msgstr "" #: uninstalling.page:18 msgid "Removing Tor Browser from your system is simple:" -msgstr "" +msgstr "הסרת דפדפן Tor מהמערכתך שלך היא פשוטה:" #: uninstalling.page:24 msgid "" @@ -1326,6 +1361,8 @@ msgid "" "external ref='media/updating/update1.png' " "md5='9ff01eb653d92124746fc31efde2bf07'" msgstr "" +"external ref='media/updating/update1.png' " +"md5='9ff01eb653d92124746fc31efde2bf07'" #: updating.page:32 msgid "" @@ -1343,6 +1380,8 @@ msgid "" "external ref='media/updating/update3.png' " "md5='4bd08622b0cacf20b13f75c432176ed3'" msgstr "" +"external ref='media/updating/update3.png' " +"md5='4bd08622b0cacf20b13f75c432176ed3'" #: updating.page:41 msgid "" @@ -1360,6 +1399,8 @@ msgid "" "external ref='media/updating/update4.png' " "md5='1d795e7b695738531db9d4b2b0fb5313'" msgstr "" +"external ref='media/updating/update4.png' " +"md5='1d795e7b695738531db9d4b2b0fb5313'" #: updating.page:50 msgid ""

1 0