- tor-commits - lists.torproject.org

[tech-reports/master] Merge branch 'sjm-reports'
by karsten＠torproject.org 26 Aug '12

26 Aug '12

commit 4a3ac5160c5feb2d599f15cf9027b18699f4bb8e Merge: 24885cc 3834323 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Aug 26 07:58:03 2012 +0200 Merge branch 'sjm-reports' 2011/datagram-comparison/.gitignore | 3 + 2011/datagram-comparison/NOTES.txt | 6 + 2011/datagram-comparison/datagram-comparison.mm | 222 ++++++ 2011/datagram-comparison/datagram-comparison.tex | 495 ++++++++++++ 2011/datagram-comparison/freedom-data.pdf | Bin 0 -> 14592 bytes 2011/datagram-comparison/freedom-data.svg | 717 +++++++++++++++++ 2011/datagram-comparison/liberatore-data.pdf | Bin 0 -> 14479 bytes 2011/datagram-comparison/liberatore-data.svg | 742 ++++++++++++++++++ 2011/datagram-comparison/reardon-data.pdf | Bin 0 -> 14776 bytes 2011/datagram-comparison/reardon-data.svg | 822 ++++++++++++++++++++ 2011/datagram-comparison/references.bib | 74 ++ 2011/datagram-comparison/tor-data.pdf | Bin 0 -> 14091 bytes 2011/datagram-comparison/tor-data.svg | 738 ++++++++++++++++++ 2011/datagram-comparison/tor-extension.pdf | Bin 0 -> 11779 bytes 2011/datagram-comparison/tor-extension.svg | 617 +++++++++++++++ 2011/datagram-comparison/tortechrep.cls | 1 + 2011/datagram-comparison/viecco-data.pdf | Bin 0 -> 15242 bytes 2011/datagram-comparison/viecco-data.svg | 780 +++++++++++++++++++ 2012/datagram-testing-plan/.gitignore | 3 + .../datagram-testing-plan.bib | 25 + .../datagram-testing-plan.tex | 137 ++++ 2012/datagram-testing-plan/tortechrep.cls | 1 + 2012/pluggable-roadmap/.gitignore | 3 + 2012/pluggable-roadmap/pluggable-roadmap.bib | 17 + 2012/pluggable-roadmap/pluggable-roadmap.tex | 262 +++++++ 2012/pluggable-roadmap/tortechrep.cls | 1 + 26 files changed, 5666 insertions(+), 0 deletions(-)

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 25 Aug '12

25 Aug '12

commit edf6175cffddab76a22e243e631b6a3fdbf03aed Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 25 11:15:28 2012 +0000 Update translations for whisperback_completed --- pl_PL/pl_PL.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pl_PL/pl_PL.po b/pl_PL/pl_PL.po index 044b9ac..352b1a6 100644 --- a/pl_PL/pl_PL.po +++ b/pl_PL/pl_PL.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-08-25 10:41+0000\n" +"PO-Revision-Date: 2012-08-25 10:47+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -228,7 +228,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - wysyłaj informacje zwrotne zaszyfrowaną pocztą\n" +msgstr "WhisperBack - wysyłaj informacje zwrotne zaszyfrowaną pocztą\nCopyright © 2009-2012 deweloperzy Tails (tails(a)boum.org)\nNiniejszy program jest wolnym oprogramowaniem; możesz go\nrozprowadzać dalej i/lub modyfikować na warunkach Powszechnej\nLicencji Publicznej GNU, wydanej przez Fundację Wolnego\nOprogramowania - według wersji 3-ciej tej Licencji lub którejś\nz późniejszych wersji.\n\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on\nużyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej\ngwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH\nZASTOSOWAŃ. W celu uzyskania bliższych informacji - Powszechna\nLicencja Publiczna GNU.\n\nZ pewnością wraz z niniejszym programem otrzymałeś też egzemplarz\nPowszechnej Licencji Publicznej GNU (GNU General Public License);\njeśli nie - zajrzyj na <http://www.gnu.org/licenses/>.\n\n" #: ../data/whisperback.ui.h:28 msgid "debugging info"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 25 Aug '12

25 Aug '12

commit 93be9968d2c22777d182ae996b6d59710f30a002 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 25 11:15:27 2012 +0000 Update translations for whisperback --- pl_PL/pl_PL.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pl_PL/pl_PL.po b/pl_PL/pl_PL.po index 044b9ac..352b1a6 100644 --- a/pl_PL/pl_PL.po +++ b/pl_PL/pl_PL.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-08-25 10:41+0000\n" +"PO-Revision-Date: 2012-08-25 10:47+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -228,7 +228,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - wysyłaj informacje zwrotne zaszyfrowaną pocztą\n" +msgstr "WhisperBack - wysyłaj informacje zwrotne zaszyfrowaną pocztą\nCopyright © 2009-2012 deweloperzy Tails (tails(a)boum.org)\nNiniejszy program jest wolnym oprogramowaniem; możesz go\nrozprowadzać dalej i/lub modyfikować na warunkach Powszechnej\nLicencji Publicznej GNU, wydanej przez Fundację Wolnego\nOprogramowania - według wersji 3-ciej tej Licencji lub którejś\nz późniejszych wersji.\n\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on\nużyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej\ngwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH\nZASTOSOWAŃ. W celu uzyskania bliższych informacji - Powszechna\nLicencja Publiczna GNU.\n\nZ pewnością wraz z niniejszym programem otrzymałeś też egzemplarz\nPowszechnej Licencji Publicznej GNU (GNU General Public License);\njeśli nie - zajrzyj na <http://www.gnu.org/licenses/>.\n\n" #: ../data/whisperback.ui.h:28 msgid "debugging info"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 25 Aug '12

25 Aug '12

commit 28aaba72612cd8dbb69d59b198ab864211268916 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 25 10:45:29 2012 +0000 Update translations for whisperback_completed --- pl_PL/pl_PL.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pl_PL/pl_PL.po b/pl_PL/pl_PL.po index f2081e4..044b9ac 100644 --- a/pl_PL/pl_PL.po +++ b/pl_PL/pl_PL.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <bog.d(a)gazeta.pl>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-03-03 12:52+0000\n" +"PO-Revision-Date: 2012-08-25 10:41+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -156,8 +157,8 @@ msgid "Send feedback in an encrypted mail." msgstr "Wyślij informacje w szyfrowanej poczcie." #: ../whisperBack/gui.py:405 -msgid "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" -msgstr "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" +msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "Copyright © 2009-2012 deweloperzy Tails (tails(a)boum.org)" #: ../whisperBack/gui.py:406 msgid "Tails developers <tails(a)boum.org>" @@ -181,8 +182,8 @@ msgid "Bug description" msgstr "Opis błędu" #: ../data/whisperback.ui.h:3 -msgid "Copyright © 2009-2011 tails(a)boum.org" -msgstr "Copyright © 2009-2011 tails(a)boum.or" +msgid "Copyright © 2009-2012 tails(a)boum.org" +msgstr "Copyright © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:4 msgid "Help" @@ -213,7 +214,7 @@ msgstr "Szcegóły techniczne do załączenia" #: ../data/whisperback.ui.h:12 msgid "" "WhisperBack - Send feedback in an encrypted mail\n" -"Copyright (C) 2009-2011 Tails developers <tails(a)boum.org>\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" "\n" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -227,7 +228,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - Wyślij informacje zwrotne w szyfrowanej poczcie\nCopyright (C) 2009-2011 Tails developers <tails(a)boum.org>\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 3 of the License, or (at\nyour option) any later version.\n\nThis program is distributed in the hope that it will be useful, but\nWITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "WhisperBack - wysyłaj informacje zwrotne zaszyfrowaną pocztą\n" #: ../data/whisperback.ui.h:28 msgid "debugging info"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 25 Aug '12

25 Aug '12

commit cd9b6b145342d576e8ee0100957346551b86aa6a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 25 10:45:26 2012 +0000 Update translations for whisperback --- pl_PL/pl_PL.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pl_PL/pl_PL.po b/pl_PL/pl_PL.po index fc944a9..044b9ac 100644 --- a/pl_PL/pl_PL.po +++ b/pl_PL/pl_PL.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <bog.d(a)gazeta.pl>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-08-16 09:20+0000\n" +"PO-Revision-Date: 2012-08-25 10:41+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -157,7 +158,7 @@ msgstr "Wyślij informacje w szyfrowanej poczcie." #: ../whisperBack/gui.py:405 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -msgstr "" +msgstr "Copyright © 2009-2012 deweloperzy Tails (tails(a)boum.org)" #: ../whisperBack/gui.py:406 msgid "Tails developers <tails(a)boum.org>" @@ -182,7 +183,7 @@ msgstr "Opis błędu" #: ../data/whisperback.ui.h:3 msgid "Copyright © 2009-2012 tails(a)boum.org" -msgstr "" +msgstr "Copyright © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:4 msgid "Help" @@ -227,7 +228,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - wysyłaj informacje zwrotne zaszyfrowaną pocztą\n" #: ../data/whisperback.ui.h:28 msgid "debugging info"

1 0

[compass/master] Fix output of relays with missing country/AS info.
by karsten＠torproject.org 25 Aug '12

25 Aug '12

commit 1ed50eb69d1e56f4f65857a8c4a5f0aa14836355 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Aug 25 09:56:16 2012 +0200 Fix output of relays with missing country/AS info. --- compass.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compass.py b/compass.py index 7da2a67..a3bdd9c 100755 --- a/compass.py +++ b/compass.py @@ -248,9 +248,9 @@ class RelayStats(object): fingerprint = relay['fingerprint'] if not links else "https://atlas.torproject.org/#details/%s" % relay['fingerprint'] exit = 'Exit' if 'Exit' in set(relay['flags']) else '-' guard = 'Guard' if 'Guard' in set(relay['flags']) else '-' - country = relay.get('country', '') - as_number = relay.get('as_number', '') - as_name = relay.get('as_name', '') + country = relay.get('country', '??') + as_number = relay.get('as_number', '??') + as_name = relay.get('as_name', '??') relays_in_group += 1 if by_country or by_as_number: nickname = "(%d relays)" % relays_in_group

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 24 Aug '12

24 Aug '12

commit 6864a44a4a6372c909ed8ea308881e4e8420046e Merge: ca09ea0 ce4add4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 24 12:51:50 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6472 | 4 ++++ src/or/dns.c | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-)

1 0

[tor/master] When iterating over connections pending DNS, skip marked ones
by nickm＠torproject.org 24 Aug '12

24 Aug '12

commit 223e7cfabec5a75a7acd919210f838511e39cb16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 16:46:11 2012 -0400 When iterating over connections pending DNS, skip marked ones Failure to do this would lead to double-free cases and similar, especially when the exit's DNS was broken. See bug 6472 for full details; this is a fix for 6472. Anonymous patch from "cypherpunks" on trac. --- changes/bug6472 | 4 ++++ src/or/dns.c | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/changes/bug6472 b/changes/bug6472 new file mode 100644 index 0000000..dcd42eb --- /dev/null +++ b/changes/bug6472 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid a pair of double-free and use-after-mark bugs that can + occur with certain timings in canceled and re-received DNS + requests. Fix for bug 6472; bugfix on 0.0.7rc1. diff --git a/src/or/dns.c b/src/or/dns.c index 3e88fad..78893bf 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -450,16 +450,17 @@ purge_expired_resolves(time_t now) if (resolve->pending_connections) { log_debug(LD_EXIT, "Closing pending connections on timed-out DNS resolve!"); - tor_fragile_assert(); while (resolve->pending_connections) { pend = resolve->pending_connections; resolve->pending_connections = pend->next; /* Connections should only be pending if they have no socket. */ tor_assert(!SOCKET_OK(pend->conn->_base.s)); pendconn = pend->conn; - connection_edge_end(pendconn, END_STREAM_REASON_TIMEOUT); - circuit_detach_stream(circuit_get_by_edge_conn(pendconn), pendconn); - connection_free(TO_CONN(pendconn)); + if (!pendconn->_base.marked_for_close) { + connection_edge_end(pendconn, END_STREAM_REASON_TIMEOUT); + circuit_detach_stream(circuit_get_by_edge_conn(pendconn), pendconn); + connection_free(TO_CONN(pendconn)); + } tor_free(pend); } } @@ -1091,6 +1092,13 @@ dns_found_answer(const char *address, uint8_t is_reverse, uint32_t addr, pendconn = pend->conn; /* don't pass complex things to the connection_mark_for_close macro */ assert_connection_ok(TO_CONN(pendconn),time(NULL)); + if (pendconn->_base.marked_for_close) { + /* prevent double-remove. */ + pendconn->_base.state = EXIT_CONN_STATE_RESOLVEFAILED; + resolve->pending_connections = pend->next; + tor_free(pend); + continue; + } tor_addr_from_ipv4h(&pendconn->_base.addr, addr); pendconn->address_ttl = ttl;

1 0

[tor/master] Merge remote-tracking branch 'public/bug6472' into maint-0.2.3
by nickm＠torproject.org 24 Aug '12

24 Aug '12

commit ce4add498f6af197a0e856d262825d547f898305 Merge: 991a8ac 223e7cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 24 12:51:02 2012 -0400 Merge remote-tracking branch 'public/bug6472' into maint-0.2.3 changes/bug6472 | 4 ++++ src/or/dns.c | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-)

1 0

[metrics-web/master] Change almost-fast-exit graphs to match Compass' results.
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit 69eeeeaa8991378fb58e195ebbfa8356d8837d65 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 24 20:21:56 2012 +0200 Change almost-fast-exit graphs to match Compass' results. --- rserve/graphs.R | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 1379691..470cdce 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -957,21 +957,30 @@ plot_almost_fast_exits <- function(start, end, path, dpi) { t$min_advbw == 5000 & t$same_network == TRUE, ] t2 <- t[t$min_rate == 10000 & t$ports == "80-443" & t$min_advbw == 2000 & t$same_network == FALSE, ] - t <- rbind(data.frame(t1, var = paste("95+ Mbit/s, 5000+ KB/s,", - "80/443/554/1755, 2- per /24")), - data.frame(t2, var = "80+ Mbit/s, 2000+ KB/s, 80/443")) - t <- aggregate(list(relays = t$relays, P_exit = 100 * t$exit_prob), + t <- rbind(data.frame(t1, var = "fast"), + data.frame(t2, var = "almost_fast")) + r <- cast(t, valid_after ~ var, value = "relays") + r <- data.frame(valid_after = r$valid_after, fast = r$fast, + almost = r$almost_fast - r$fast, var = "relays") + e <- cast(t, valid_after ~ var, value = "exit_prob") + e <- data.frame(valid_after = e$valid_after, fast = 100 * e$fast, + almost = 100 * (e$almost_fast - e$fast), var = "exit_prob") + t <- rbind(r, e) + t <- aggregate(list(fast = t$fast, almost = t$almost), by = list(date = as.Date(cut.Date(as.Date(t$valid_after), "day")), - var = t$var), FUN = median) + var = ifelse(t$var == "exit_prob", "Total exit probability (in %)", + "Number of relays")), FUN = median) t <- melt(t, id.vars = c("date", "var")) - t <- data.frame(t, type = ifelse(t$variable == "P_exit", - "Total exit probability (in %)", "Number of relays")) - ggplot(t, aes(x = date, y = value, colour = var)) + + t <- data.frame(t, type = ifelse(t$variable == "fast", + "fast exits (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755, 2- per /24", + paste("almost fast exits (80+ Mbit/s, 2000+ KB/s, 80/443,", + "not in set of fast exits)"))) + ggplot(t, aes(x = date, y = value, colour = type)) + geom_line(size = 0.75) + - facet_grid(type ~ ., scales = "free_y") + + facet_grid(var ~ ., scales = "free_y") + scale_x_date(name = "") + scale_y_continuous(name = "") + - scale_colour_manual(name = "", values = c("purple", "orange")) + + scale_colour_manual(name = "", values = c("orange", "purple")) + opts(title = "Relays almost meeting the fast-exit requirements", legend.position = "top") ggsave(filename = path, width = 8, height = 6, dpi = as.numeric(dpi))

1 0