tor-commits April 2013

tor-commits@lists.torproject.org

19 participants
1496 discussions

[tor/master] Merge remote-tracking branch 'public/bug8427' into maint-0.2.4
by nickm＠torproject.org 02 Apr '13

02 Apr '13

commit 2c155064aaa77d5a59169388c89723b8dd53d589 Merge: 8e05001 16f2e4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 2 10:36:15 2013 -0400 Merge remote-tracking branch 'public/bug8427' into maint-0.2.4 changes/bug8427 | 5 +++++ src/or/connection.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 02 Apr '13

02 Apr '13

commit 7ccaf3f1a485ece89e6bf27e419f16dc9e88d891 Merge: e755e14 2c15506 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 2 10:37:00 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8427 | 5 +++++ src/or/connection.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8427' into maint-0.2.4
by nickm＠torproject.org 02 Apr '13

02 Apr '13

1 0

[tor/maint-0.2.4] Don't warn about not sending a socks reply if we get a write error
by nickm＠torproject.org 02 Apr '13

02 Apr '13

commit 16f2e4aa8ce76387c19687dd0c78c97929a852d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 12 17:36:09 2013 -0400 Don't warn about not sending a socks reply if we get a write error If we get a write error on a SOCKS connection, we can't send a SOCKS reply, now can we? This bug has been here since 36baf7219, where we added the "hey, I'm closing an AP connection but I haven't finished the socks handshake!" message. It's bug 8427. --- changes/bug8427 | 5 +++++ src/or/connection.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug8427 b/changes/bug8427 new file mode 100644 index 0000000..22b003f --- /dev/null +++ b/changes/bug8427 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - If we encounter a write failure on a SOCKS connection before we + finish our SOCKS handshake, don't warn that we closed the + connection before we could send a SOCKS reply. Fixes bug 8427; + bugfix on 0.1.0.1-rc. diff --git a/src/or/connection.c b/src/or/connection.c index eac9c4f..75c1656 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3286,6 +3286,10 @@ connection_handle_write_impl(connection_t *conn, int force) if (result < 0) { if (CONN_IS_EDGE(conn)) connection_edge_end_errno(TO_EDGE_CONN(conn)); + if (conn->type == CONN_TYPE_AP) { + /* writing failed; we couldn't send a SOCKS reply if we wanted to */ + TO_ENTRY_CONN(conn)->socks_request->has_finished = 1; + } connection_close_immediate(conn); /* Don't flush; connection is dead. */ connection_mark_for_close(conn);

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 02 Apr '13

02 Apr '13

commit 6bd68e06e892b15b6134461bca34db1e45742ace Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 2 12:15:21 2013 +0000 Update translations for vidalia_alpha --- hr_HR/vidalia_hr_HR.po | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hr_HR/vidalia_hr_HR.po b/hr_HR/vidalia_hr_HR.po index 02de8bc..66edac9 100644 --- a/hr_HR/vidalia_hr_HR.po +++ b/hr_HR/vidalia_hr_HR.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-03-30 14:41+0000\n" +"PO-Revision-Date: 2013-04-02 11:52+0000\n" "Last-Translator: nvucinic <nvucinic(a)nestabilni.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3167,31 +3167,31 @@ msgctxt "ServerPage" msgid "" "Tor returned an improperly formatted response when Vidalia requested your " "bridge's usage history." -msgstr "" +msgstr "Tor je vratio nepravilno formatiran odgovor nako što je Vidalia zatražila povijest korištenja vašeg mosta." msgctxt "ServerPage" msgid "The returned response was: %1" -msgstr "" +msgstr "Vraćeni odgovor je : %1" msgctxt "ServerPage" msgid "Help censored users reach the Tor network" -msgstr "" +msgstr "Pomognite cenzuriranim korisnicima da koriste do Tor mrežu" msgctxt "ServerPage" msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>" -msgstr "" +msgstr "<a href=\"#bridgeUsage\">Tko je koristio moj most?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">Što je ovo?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "Automatski distribuiraj adresu mog mosta" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Pošalji promet unutar Tor mreže (ne-izlazni relej)" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" @@ -3199,13 +3199,13 @@ msgstr "" msgctxt "ServerPage" msgid "Mirror the Relay Directory" -msgstr "" +msgstr "Zrcaljenje imenika releja" msgctxt "ServerPage" msgid "" "Email address at which you may be reached if there is a\n" "problem with your relay. You might also include your PGP or GPG fingerprint." -msgstr "" +msgstr "Email adresa kojom Vas se može kontaktirati ako postoji\nproblem sa vašim relejom. Možete ujedno i uključiti vaš PGP ili GPG otisak." msgctxt "ServerPage" msgid "day" @@ -3265,26 +3265,26 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Kopiraj u međuspremnik" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor je pokrenut" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Trenutno imate pokrenutu verziju \"%1\" Tor softvera." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor softver nije pokrenut" msgctxt "StatusEventWidget" msgid "" "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor " "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." -msgstr "" +msgstr "Kliknite \"Pokreni Tor\" u Vidalia kontrolnoj ploči za ponovno pokretanje Tor softvera. Ako je Tor neočekivano izašao, odaberite tab \"Napredno\" za detalje o svim greškama na koje je Tor naišao." msgctxt "StatusEventWidget" msgid "" @@ -3292,7 +3292,7 @@ msgid "" "longer recommended. Please upgrade to the most recent version of the " "software, which may contain important security, reliability and performance " "fixes." -msgstr "" +msgstr "Trenutno koristite inačicu \"%1\" Tor softvera, koja se više ne preporuča. Molimo nadogradite na najnoviju inačicu softvera, koja može sadržavate važne ispravke vezane uz pouzdanost, sigurnost i stabilnost." msgctxt "StatusEventWidget" msgid "" @@ -3304,17 +3304,17 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Vaš Tor softver je zastario." msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "Spojen na Tor mrežu" msgctxt "StatusEventWidget" msgid "" "We were able to successfully establish a connection to the Tor network. You " "can now configure your applications to use the Internet anonymously." -msgstr "" +msgstr "Uspješno je uspostavljena veza na Tor mrežu. Sada možete podesiti Vaše aplikacije za anonimno korištenje Interneta." msgctxt "StatusEventWidget" msgid "Tor Software Error"

1 0

[tor/master] changes file for bug 6520
by nickm＠torproject.org 02 Apr '13

02 Apr '13

commit e755e146bd700f56827db57e78d3b8582773fdb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 1 21:52:24 2013 -0400 changes file for bug 6520 --- changes/bug6520 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug6520 b/changes/bug6520 new file mode 100644 index 0000000..9f24f0d --- /dev/null +++ b/changes/bug6520 @@ -0,0 +1,5 @@ + o Removed features: + - Remove migration code from when we renamed the "cached-routers" + file to "cached-descriptors" back in 0.2.0.8-alpha. This + incidentally resolves #6502 by cleaning up the related code + a bit. Patch from Akshay Hebbar.

1 0

[tor/master] Removed obsolete code related to cached-routers
by nickm＠torproject.org 02 Apr '13

02 Apr '13

commit 36acde6b4e45efda9d6768aff2e631cdb9b38b0a Author: Akshay Hebbar Y S <akshayhebbarys(a)gmail.com> Date: Mon Apr 1 20:43:00 2013 +0530 Removed obsolete code related to cached-routers --- src/or/or.h | 4 ---- src/or/routerlist.c | 28 ++-------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 4d52710..1f9017c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2488,10 +2488,6 @@ typedef struct desc_store_t { * filename for a temporary file when rebuilding the store, and .new to this * filename for the journal. */ const char *fname_base; - /** Alternative (obsolete) value for fname_base: if the file named by - * fname_base isn't present, we read from here instead, but we never write - * here. */ - const char *fname_alt_base; /** Human-readable description of what this store contains. */ const char *description; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 854f85c..9742710 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -831,32 +831,18 @@ router_rebuild_store(int flags, desc_store_t *store) static int router_reload_router_list_impl(desc_store_t *store) { - char *fname = NULL, *altname = NULL, *contents = NULL; + char *fname = NULL, *contents = NULL; struct stat st; - int read_from_old_location = 0; int extrainfo = (store->type == EXTRAINFO_STORE); - time_t now = time(NULL); store->journal_len = store->store_len = 0; fname = get_datadir_fname(store->fname_base); - if (store->fname_alt_base) - altname = get_datadir_fname(store->fname_alt_base); if (store->mmap) /* get rid of it first */ tor_munmap_file(store->mmap); store->mmap = NULL; store->mmap = tor_mmap_file(fname); - if (!store->mmap && altname && file_status(altname) == FN_FILE) { - read_from_old_location = 1; - log_notice(LD_DIR, "Couldn't read %s; trying to load routers from old " - "location %s.", fname, altname); - if ((store->mmap = tor_mmap_file(altname))) - read_from_old_location = 1; - } - if (altname && !read_from_old_location) { - remove_file_if_very_old(altname, now); - } if (store->mmap) { store->store_len = store->mmap->size; if (extrainfo) @@ -873,14 +859,6 @@ router_reload_router_list_impl(desc_store_t *store) fname = get_datadir_fname_suffix(store->fname_base, ".new"); if (file_status(fname) == FN_FILE) contents = read_file_to_str(fname, RFTS_BIN|RFTS_IGNORE_MISSING, &st); - if (read_from_old_location) { - tor_free(altname); - altname = get_datadir_fname_suffix(store->fname_alt_base, ".new"); - if (!contents) - contents = read_file_to_str(altname, RFTS_BIN|RFTS_IGNORE_MISSING, &st); - else - remove_file_if_very_old(altname, now); - } if (contents) { if (extrainfo) router_load_extrainfo_from_string(contents, NULL,SAVED_IN_JOURNAL, @@ -893,9 +871,8 @@ router_reload_router_list_impl(desc_store_t *store) } tor_free(fname); - tor_free(altname); - if (store->journal_len || read_from_old_location) { + if (store->journal_len) { /* Always clear the journal on startup.*/ router_rebuild_store(RRS_FORCE, store); } else if (!extrainfo) { @@ -2469,7 +2446,6 @@ router_get_routerlist(void) routerlist->extra_info_map = eimap_new(); routerlist->desc_store.fname_base = "cached-descriptors"; - routerlist->desc_store.fname_alt_base = "cached-routers"; routerlist->extrainfo_store.fname_base = "cached-extrainfo"; routerlist->desc_store.type = ROUTER_STORE;

1 0

[torbrowser/maint-2.4] update changelogs & READMEs for pending release
by erinn＠torproject.org 01 Apr '13

01 Apr '13

commit dbfd8eef3d81b6f508132cddd8caa0e373691bed Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Apr 1 19:13:07 2013 -0400 update changelogs & READMEs for pending release --- README.LINUX-2.3 | 4 ++-- README.LINUX-2.4 | 4 ++-- README.OSX-2.3 | 4 ++-- README.OSX-2.4 | 4 ++-- README.WIN-2.3 | 4 ++-- README.WIN-2.4 | 4 ++-- changelog.linux-2.3 | 7 +++++++ changelog.linux-2.4 | 7 +++++++ changelog.osx-2.3 | 7 +++++++ changelog.osx-2.4 | 7 +++++++ changelog.windows-2.3 | 7 +++++++ changelog.windows-2.4 | 7 +++++++ 12 files changed, 54 insertions(+), 12 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 3172de3..8b0f45a 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) -Firefox 17.0.4esr +Firefox 17.0.5esr \_ Torbutton 1.5.1 - |_ NoScript 2.6.5.8 + |_ NoScript 2.6.5.9 |_ HTTPS-Everywhere 3.1.4 Usage diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 6272cc1..7789a40 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.11-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) -Firefox 17.0.4esr +Firefox 17.0.5esr \_ Torbutton 1.5.1 - |_ NoScript 2.6.5.8 + |_ NoScript 2.6.5.9 |_ HTTPS-Everywhere 4.0development.6 |_ PDF Viewer 0.7.236 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 0b16937..ba002ce 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) -Firefox 17.0.4esr +Firefox 17.0.5esr \_ Torbutton 1.5.1 - |_ NoScript 2.6.5.8 + |_ NoScript 2.6.5.9 |_ HTTPS-Everywhere 3.1.4 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 6dac734..7fca6b0 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.11-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) -Firefox 17.0.4esr +Firefox 17.0.5esr \_ Torbutton 1.5.1 - |_ NoScript 2.6.5.8 + |_ NoScript 2.6.5.9 |_ HTTPS-Everywhere 4.0development.6 |_ PDF Viewer 0.7.236 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 36f17a4..52cb637 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) -Firefox 17.0.4esr +Firefox 17.0.5esr \_ Torbutton 1.5.1 - |_ NoScript 2.6.5.8 + |_ NoScript 2.6.5.9 |_ HTTPS-Everywhere 3.1.4 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index a0fbf66..7007813 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -6,9 +6,9 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.11-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) -Firefox 17.0.4esr +Firefox 17.0.5esr \_ Torbutton 1.5.1 - |_ NoScript 2.6.5.8 + |_ NoScript 2.6.5.9 |_ HTTPS-Everywhere 4.0development.6 |_ PDF Viewer 0.7.236 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 0b0ff1b..ff8d879 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.3.25-6); suite=linux + + * Update Firefox to 17.0.5esr + * Update NoScript to 2.6.59 + + -- Erinn Clark <erinn(a)torproject.org> Mon Apr 1 19:08:16 EDT 2013 + Tor Browser Bundle (2.3.25-5); suite=linux * Update Firefox to 17.0.4esr diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 27c627d..70b6a27 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.4.11-alpha-2); suite=linux + + * Update Firefox to 17.0.5esr + * Update NoScript to 2.6.59 + + -- Erinn Clark <erinn(a)torproject.org> Mon Apr 1 19:08:37 EDT 2013 + Tor Browser Bundle (2.4.10-alpha-3); suite=linux * Update Firefox to 17.0.4esr diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index a689de8..8404db3 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.3.25-6); suite=osx + + * Update Firefox to 17.0.5esr + * Update NoScript to 2.6.59 + + -- Erinn Clark <erinn(a)torproject.org> Mon Apr 1 19:08:11 EDT 2013 + Tor Browser Bundle (2.3.25-5); suite=osx * Update Firefox to 17.0.4esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 0d38fff..ea78b76 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.4.11-alpha-2); suite=osx + + * Update Firefox to 17.0.5esr + * Update NoScript to 2.6.59 + + -- Erinn Clark <erinn(a)torproject.org> Mon Apr 1 19:08:42 EDT 2013 + Tor Browser Bundle (2.4.10-alpha-3); suite=osx * Update Firefox to 17.0.4esr diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 6a7c5c9..54fa712 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.3.25-6); suite=windows + + * Update Firefox to 17.0.5esr + * Update NoScript to 2.6.59 + + -- Erinn Clark <erinn(a)torproject.org> Mon Apr 1 19:08:14 EDT 2013 + Tor Browser Bundle (2.3.25-5); suite=windows * Update Firefox to 17.0.4esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index ec6b291..5cdb23c 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.4.11-alpha-2); suite=windows + + * Update Firefox to 17.0.5esr + * Update NoScript to 2.6.59 + + -- Erinn Clark <erinn(a)torproject.org> Mon Apr 1 19:08:39 EDT 2013 + Tor Browser Bundle (2.4.10-alpha-3); suite=windows * Update Firefox to 17.0.4esr

1 0

[torbrowser/master] update changelogs & READMEs for pending release
by erinn＠torproject.org 01 Apr '13

01 Apr '13

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 01 Apr '13

01 Apr '13

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2013