tor-commits March 2016

tor-commits@lists.torproject.org

16 participants
1259 discussions

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 14 Mar '16

14 Mar '16

commit b1aab39ec79c13010b3d3100b8c7a5833c24f099 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 14 21:45:34 2016 +0000 Update translations for mat-gui --- fa.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa.po b/fa.po index de7d952..62be58b 100644 --- a/fa.po +++ b/fa.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-03-14 21:28+0000\n" +"Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,7 +77,7 @@ msgstr "کاهش حجم و کیفیت فایل PDF تولید شده" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "حذف فایل پشتیبانی نشده از آرشیو" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 14 Mar '16

14 Mar '16

commit fba631c30f57deea27d83175c3d2d7f4a28827a4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 14 21:45:15 2016 +0000 Update translations for https_everywhere --- fa/https-everywhere.dtd | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index 7ecf9b0..5a3ee14 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -6,7 +6,7 @@ <!ENTITY https-everywhere.about.and "، و"> <!ENTITY https-everywhere.about.librarians "کتابداران قوانین"> <!ENTITY https-everywhere.about.thanks "با تشکر از"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> +<!ENTITY https-everywhere.about.many_contributors "بسیار زیادی همکار، از جمله"> <!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> <!ENTITY https-everywhere.about.contribute "اگر شما از HTTPS همه‌جا راضی هستید، پیشنهاد می‌کنیم"> <!ENTITY https-everywhere.about.donate_tor "به Tor کمک مالی کنید."> @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.about.or "یا"> <!ENTITY https-everywhere.about.donate_eff "به EFF کمک مالی کنید."> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "به EFF کمک مالی کنید."> <!ENTITY https-everywhere.menu.about "درباره‌ی HTTPS همه‌جا"> <!ENTITY https-everywhere.menu.observatory "تنظیم‌های رصدخانه‌ی SSL"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS همه‌جا را فعال کنید"> @@ -38,19 +38,19 @@ <!ENTITY https-everywhere.prefs.reset_default "بازگشت به تنظیم‌های اولیه"> <!ENTITY https-everywhere.prefs.view_xml_source "مشاهده منبع XML"> -<!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> -<!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> +<!ENTITY https-everywhere.chrome.stable_rules "قوانین پایدار"> +<!ENTITY https-everywhere.chrome.stable_rules_description "اجبار اتصال رمزگذاری شده به این وب سایت:"> +<!ENTITY https-everywhere.chrome.experimental_rules "قوانین تجربی"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "ممکن است علت، هشدار و یا شکستگی باشد. غیر فعال به طور پیش فرض."> +<!ENTITY https-everywhere.chrome.add_rule "اضافه کردن یک قانون برای این سایت"> +<!ENTITY https-everywhere.chrome.add_new_rule "اضافه کردن یک قانون جدید برای این سایت"> +<!ENTITY https-everywhere.chrome.always_https_for_host "همیشه از https برای این میزبان استفاده شود"> +<!ENTITY https-everywhere.chrome.host "ميزبان:"> +<!ENTITY https-everywhere.chrome.show_advanced "نمایش پیشرفته"> +<!ENTITY https-everywhere.chrome.hide_advanced "مخفی‌کردن پیشرفته"> +<!ENTITY https-everywhere.chrome.rule_name "نام قانون"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.redirect_to "تغییر مسیر به"> +<!ENTITY https-everywhere.chrome.status_cancel_button "لغو">

1 0

[tor-messenger-build/master] Switch to ESR 45
by arlo＠torproject.org 14 Mar '16

14 Mar '16

commit 0b2027392c8ae2c56fbbb3d24dd31e1fe9c0f6b5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Mar 14 13:10:54 2016 -0700 Switch to ESR 45 --- projects/instantbird/config | 4 ++-- projects/mozilla/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index b9d846c..67672bb 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -hg_url: https://hg.mozilla.org/releases/comm-release/ -hg_hash: THUNDERBIRD_42_0b2_RELEASE +hg_url: https://hg.mozilla.org/releases/comm-esr45/ +hg_hash: THUNDERBIRD_45_0b2_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" remote_docker: 1 var: diff --git a/projects/mozilla/config b/projects/mozilla/config index 2e813b5..f96adbe 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -hg_url: https://hg.mozilla.org/releases/mozilla-release/ -hg_hash: FIREFOX_42_0_RELEASE +hg_url: https://hg.mozilla.org/releases/mozilla-esr45/ +hg_hash: THUNDERBIRD_45_0b2_RELEASE src: | #!/bin/sh set -e

1 0

[tor/master] Merge branch 'bug15221_027'
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit 4b02af452d12b35e58d3a8e5e7ef042970e26774 Merge: 36ad65a 725e0c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 14 14:10:47 2016 -0400 Merge branch 'bug15221_027' changes/bug15221 | 4 ++++ src/common/sandbox.c | 9 +++++++++ 2 files changed, 13 insertions(+)

1 0

[tor/master] Permit setrlimit, prlimit, prlimit64 calls.
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit 725e0c76e3df9d3ea4b861b3ff5279b23def4ef9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 14 13:21:16 2016 -0400 Permit setrlimit, prlimit, prlimit64 calls. We call setrlimit under some circumstances, and it can call prlimit and prlimit64 under the hood. Fixes bug 15221. --- changes/bug15221 | 4 ++++ src/common/sandbox.c | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug15221 b/changes/bug15221 new file mode 100644 index 0000000..ed72309 --- /dev/null +++ b/changes/bug15221 @@ -0,0 +1,4 @@ + o Minor bugfixes (sandbox): + - Allow the setrlimit syscall, and the prlimit and prlimit64 syscalls, + which some libc implementations + use under the hood. Fixes bug 15221. Bugfix on 0.2.5.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 950a92f..bcbb3ce 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -177,11 +177,20 @@ static int filter_nopar_gen[] = { SCMP_SYS(mmap), #endif SCMP_SYS(munmap), +#ifdef __NR_prlimit + SCMP_SYS(prlimit), +#endif +#ifdef __NR_prlimit64 + SCMP_SYS(prlimit64), +#endif SCMP_SYS(read), SCMP_SYS(rt_sigreturn), SCMP_SYS(sched_getaffinity), SCMP_SYS(sendmsg), SCMP_SYS(set_robust_list), +#ifdef __NR_setrlimit + SCMP_SYS(setrlimit), +#endif #ifdef __NR_sigreturn SCMP_SYS(sigreturn), #endif

1 0

[goptlib/master] Use spec.torproject.org permalinks where possible.
by dcf＠torproject.org 14 Mar '16

14 Mar '16

commit 1df99a25f79ac9088cf8500a190cbdaf7a641b50 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 14 10:24:15 2016 -0700 Use spec.torproject.org permalinks where possible. --- README | 2 +- pt.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index c4ca377..7139b9e 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ goptlib is a library for writing Tor pluggable transports in Go. -https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt +https://spec.torproject.org/pt-spec https://gitweb.torproject.org/torspec.git/tree/proposals/196-transport-cont… https://gitweb.torproject.org/torspec.git/tree/proposals/217-ext-orport-aut… diff --git a/pt.go b/pt.go index a838308..28e5bb7 100644 --- a/pt.go +++ b/pt.go @@ -117,7 +117,7 @@ // the example programs dummy-client and dummy-server. // // Tor pluggable transports specification: -// https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt. +// https://spec.torproject.org/pt-spec // // Extended ORPort: // https://gitweb.torproject.org/torspec.git/tree/proposals/196-transport-cont….

1 0

[goptlib/master] Link prop. 232 in README (was already linked in pt.go).
by dcf＠torproject.org 14 Mar '16

14 Mar '16

commit f17a5f239f705d7e39a8bccbebdf9927cc99dbeb Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 14 10:24:42 2016 -0700 Link prop. 232 in README (was already linked in pt.go). --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 7139b9e..dc605d1 100644 --- a/README +++ b/README @@ -3,6 +3,7 @@ goptlib is a library for writing Tor pluggable transports in Go. https://spec.torproject.org/pt-spec https://gitweb.torproject.org/torspec.git/tree/proposals/196-transport-cont… https://gitweb.torproject.org/torspec.git/tree/proposals/217-ext-orport-aut… +https://gitweb.torproject.org/torspec.git/tree/proposals/232-pluggable-transports-through-proxy.txt To download a copy of the library into $GOPATH: go get git.torproject.org/pluggable-transports/goptlib.git

1 0

[nyx/master] Fix curses flickering
by atagar＠torproject.org 14 Mar '16

14 Mar '16

commit df0fc05f405e3fbffe0acb28d276e5ef27f5af3e Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 14 10:09:05 2016 -0700 Fix curses flickering Commit 6f91af2 fixed an issue where we froze when viewing the connections page after first starting, but at the expense of making our whole interface flicker. This is most noticeable when pressing 'm' to browse the menu. Can't say I'm entirely clear what's up. The connection panel had its own thread outside the draw loop so I wouldn't expect it to cause this sort of disruption, though due to the GIL that's of course possible. Oh well - doing this in the tracker is just better all around... * no more curses flickering * connection panel can be viewed right away * code's more elegant --- nyx/panel/connection.py | 9 --------- nyx/tracker.py | 28 +++++++++++++--------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 7e19a02..e3124d9 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -407,15 +407,6 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): self._update() self.redraw(True) - - # If this is our first run then fill in our fingerprint tracker. This - # requires fetching all the router status entries which takes a few - # seconds, so best done when we're finished with the rest of the first - # iteration to hide the lag. - - if last_ran == -1: - nyx.tracker.get_consensus_tracker().update(tor_controller().get_network_statuses([])) - last_ran = time.time() def get_help(self): diff --git a/nyx/tracker.py b/nyx/tracker.py index a772ff9..662f965 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -29,7 +29,6 @@ Background tasks for gathering information about the tor process. +- stop - stops further work by the daemon ConsensusTracker - performant lookups for consensus related information - |- update - updates the consensus information we're based on |- get_relay_nickname - provides the nickname for a given relay |- get_relay_fingerprints - provides relays running at a location +- get_relay_address - provides the address a relay is running at @@ -815,25 +814,24 @@ class ConsensusTracker(object): def _new_consensus_event(self, event): self.update(event.desc) - def update(self, router_status_entries): + def _task(self, process_pid, process_name): """ - Updates our cache with the given router status entries. - - :param list router_status_entries: router status entries to populate our cache with + If this is our first run then populate our cache. """ - new_fingerprint_cache = {} - new_address_cache = {} - new_nickname_cache = {} + if not self._fingerprint_cache: + new_fingerprint_cache = {} + new_address_cache = {} + new_nickname_cache = {} - for desc in router_status_entries: - new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) - new_address_cache[desc.fingerprint] = (desc.address, desc.or_port) - new_nickname_cache[desc.fingerprint] = desc.nickname if desc.nickname else 'Unnamed' + for desc in tor_controller().get_network_statuses([]): + new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) + new_address_cache[desc.fingerprint] = (desc.address, desc.or_port) + new_nickname_cache[desc.fingerprint] = desc.nickname if desc.nickname else 'Unnamed' - self._fingerprint_cache = new_fingerprint_cache - self._address_cache = new_address_cache - self._nickname_cache = new_nickname_cache + self._fingerprint_cache = new_fingerprint_cache + self._address_cache = new_address_cache + self._nickname_cache = new_nickname_cache def get_relay_nickname(self, fingerprint): """

1 0

[tor/master] If we start/stop reading on a dnsserv connection, don't assert.
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit e79da62645925f3286deb21740bbe91de9dafacc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 534a6ac..3fb80e1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -578,6 +578,12 @@ connection_stop_reading,(connection_t *conn)) return; }); + /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event); if (conn->linked) { @@ -603,6 +609,12 @@ connection_start_reading,(connection_t *conn)) return; }); + /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event); if (conn->linked) {

1 0

[tor/master] Change behavior on missing/present event to warn instead of asserting.
by nickm＠torproject.org 14 Mar '16

14 Mar '16

commit 91d7cf50c6cb6eb1e2dc2b4a8eab489c10a759a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 ++++++++ src/or/main.c | 49 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/changes/bug16248 b/changes/bug16248 new file mode 100644 index 0000000..399b709 --- /dev/null +++ b/changes/bug16248 @@ -0,0 +1,8 @@ + o Major bugfixes (dns proxy mode, crash): + - Avoid crashing when running as a DNS proxy. Closes bug 16248; bugfix on + 0.2.0.1-alpha. Patch from 'cypherpunks'. + + o Minor features (bug-resistance): + - Make Tor survive errors involving connections without a corresponding + event object. Previously we'd fail with an assertion; now we produce a + log message. Related to bug 16248. diff --git a/src/or/main.c b/src/or/main.c index 3fb80e1..f91049b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -567,6 +567,35 @@ connection_is_reading(connection_t *conn) (conn->read_event && event_pending(conn->read_event, EV_READ, NULL)); } +static int +connection_check_event(connection_t *conn, struct event *ev) +{ + int bad; + + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + bad = ev != NULL; + } else { + bad = ev == NULL; + } + + if (bad) { + log_warn(LD_BUG, "Event missing on connection %p [%s;%s]. " + "socket=%d. linked=%d. " + "is_dns_request=%d. Marked_for_close=%s:%d", + conn, + conn_type_to_string(conn->type), + conn_state_to_string(conn->type, conn->state), + (int)conn->s, (int)conn->linked, + (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request), + conn->marked_for_close_file ? conn->marked_for_close_file : "-", + conn->marked_for_close + ); + log_backtrace(LOG_WARN, LD_BUG, "Backtrace attached."); + return -1; + } + return 0; +} + /** Tell the main loop to stop notifying <b>conn</b> of any read events. */ MOCK_IMPL(void, connection_stop_reading,(connection_t *conn)) @@ -578,14 +607,10 @@ connection_stop_reading,(connection_t *conn)) return; }); - /* if dummy conn then no socket and no event, nothing to do here */ - if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { - tor_assert(!conn->read_event); + if (connection_check_event(conn, conn->read_event) < 0) { return; } - tor_assert(conn->read_event); - if (conn->linked) { conn->reading_from_linked_conn = 0; connection_stop_reading_from_linked_conn(conn); @@ -609,14 +634,10 @@ connection_start_reading,(connection_t *conn)) return; }); - /* if dummy conn then no socket and no event, nothing to do here */ - if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { - tor_assert(!conn->read_event); + if (connection_check_event(conn, conn->read_event) < 0) { return; } - tor_assert(conn->read_event); - if (conn->linked) { conn->reading_from_linked_conn = 1; if (connection_should_read_from_linked_conn(conn)) @@ -655,7 +676,9 @@ connection_stop_writing,(connection_t *conn)) return; }); - tor_assert(conn->write_event); + if (connection_check_event(conn, conn->write_event) < 0) { + return; + } if (conn->linked) { conn->writing_to_linked_conn = 0; @@ -681,7 +704,9 @@ connection_start_writing,(connection_t *conn)) return; }); - tor_assert(conn->write_event); + if (connection_check_event(conn, conn->write_event) < 0) { + return; + } if (conn->linked) { conn->writing_to_linked_conn = 1;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2016