December 2013 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Merge branch 'bug10465' into maint-0.2.4
by nickm＠torproject.org 22 Dec '13

22 Dec '13

commit 59a162f7d2048bc5e6bbc953c2bdc76a0367221b Merge: 2c956f0 b9f6e40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 22 17:20:22 2013 -0500 Merge branch 'bug10465' into maint-0.2.4 changes/bug10465 | 3 +++ src/or/connection_edge.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.4] Fix automapping to ipv6
by nickm＠torproject.org 22 Dec '13

22 Dec '13

commit b9f6e40ecbc9469abeefa7e73d724917d0bbcc24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 22 08:38:36 2013 -0500 Fix automapping to ipv6 Bugfix on 0.2.4.7-alpha; fixes bug 10465. --- changes/bug10465 | 3 +++ src/or/connection_edge.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/changes/bug10465 b/changes/bug10465 new file mode 100644 index 0000000..330f969 --- /dev/null +++ b/changes/bug10465 @@ -0,0 +1,3 @@ + o Major bugfixes: + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. Fixes bug 10465; bugfix on 0.2.4.7-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index bb7ffb9..3a72110 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -61,6 +61,11 @@ static int connection_ap_process_natd(entry_connection_t *conn); static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); +static void connection_ap_handshake_socks_resolved_addr( + entry_connection_t *conn, + const tor_addr_t *answer, + int ttl, + time_t expires); /** An AP stream has failed/finished. If it hasn't already sent back * a socks reply, send one now (based on endreason). Also set @@ -1156,17 +1161,13 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, } if (socks->command == SOCKS_COMMAND_RESOLVE) { - uint32_t answer; - struct in_addr in; + tor_addr_t answer; /* Reply to resolves immediately if we can. */ - if (tor_inet_aton(socks->address, &in)) { /* see if it's an IP already */ - /* leave it in network order */ - answer = in.s_addr; + if (tor_addr_parse(&answer, socks->address) >= 0) {/* is it an IP? */ /* remember _what_ is supposed to have been resolved. */ strlcpy(socks->address, orig_address, sizeof(socks->address)); - connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4, - (uint8_t*)&answer, - -1,map_expires); + connection_ap_handshake_socks_resolved_addr(conn, &answer, -1, + map_expires); connection_mark_unattached_ap(conn, END_STREAM_REASON_DONE | END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@ -2059,6 +2060,35 @@ tell_controller_about_resolved_result(entry_connection_t *conn, } } +/** + * As connection_ap_handshake_socks_resolved, but take a tor_addr_t to send + * as the answer. + */ +static void +connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, + const tor_addr_t *answer, + int ttl, + time_t expires) +{ + if (tor_addr_family(answer) == AF_INET) { + uint32_t a = tor_addr_to_ipv4n(answer); /* network order */ + connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4, + (uint8_t*)&a, + ttl, expires); + } else if (tor_addr_family(answer) == AF_INET6) { + const uint8_t *a = tor_addr_to_in6_addr8(answer); + connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV6,16, + a, + ttl, expires); + } else { + log_warn(LD_BUG, "Got called with address of unexpected family %d", + tor_addr_family(answer)); + connection_ap_handshake_socks_resolved(conn, + RESOLVED_TYPE_ERROR,0,NULL,-1,-1); + } +} + + /** Send an answer to an AP connection that has requested a DNS lookup via * SOCKS. The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or -1 * for unreachable; the answer should be in the format specified in the socks

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 22 Dec '13

22 Dec '13

commit 2cb955ef88aa2a64ee9edd4275475033809e59ed Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 22 19:45:58 2013 +0000 Update translations for https_everywhere_completed --- pt_BR/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index dac0edf..b104069 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -46,9 +46,9 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.done "Pronto"> <!ENTITY ssl-observatory.prefs.explanation -"O HTTPS Em todo lugar pode usar o EFF's SSL Observatório, para realizar duas funções: (1) enviar cópias dos certificados HTTPS ao Observatório, para ajudar-nos +"O HTTPS Everywhere pode usar o Observatório SSL de EFFs para realizar duas funções: (1) Enviar que ocorra o envio de cópias dos certificados HTTPS ao Observatório, o que nos ajuda a detectar o "homem no meio" destes ataques e melhorar a segurança da Web; e (2) -Avisar-nos sobre conexões inseguras ou ataques ao seu navegador."> +Avisar-nos sobre as conexões inseguras ou ataques ao seu navegador."> <!--<!ENTITY ssl-observatory.prefs.explanation2 "When you visit https://www.example.com, the Observatory will learn that

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 22 Dec '13

22 Dec '13

commit 12aed28824789bd5dae2ec57c2d7e31748d3016d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 22 19:45:53 2013 +0000 Update translations for https_everywhere --- pt_BR/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index dac0edf..b104069 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -46,9 +46,9 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.done "Pronto"> <!ENTITY ssl-observatory.prefs.explanation -"O HTTPS Em todo lugar pode usar o EFF's SSL Observatório, para realizar duas funções: (1) enviar cópias dos certificados HTTPS ao Observatório, para ajudar-nos +"O HTTPS Everywhere pode usar o Observatório SSL de EFFs para realizar duas funções: (1) Enviar que ocorra o envio de cópias dos certificados HTTPS ao Observatório, o que nos ajuda a detectar o "homem no meio" destes ataques e melhorar a segurança da Web; e (2) -Avisar-nos sobre conexões inseguras ou ataques ao seu navegador."> +Avisar-nos sobre as conexões inseguras ou ataques ao seu navegador."> <!--<!ENTITY ssl-observatory.prefs.explanation2 "When you visit https://www.example.com, the Observatory will learn that

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 22 Dec '13

22 Dec '13

commit c77d7a2052a81fc3b696b0fa6b990112cc6fc205 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 22 19:15:56 2013 +0000 Update translations for https_everywhere_completed --- pt_BR/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index 54362fa..dac0edf 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -85,7 +85,7 @@ Passe o mouse sobre as opções para ver mais detalhes:"> <!ENTITY ssl-observatory.warning.showcert "Mostrar a série do certificado"> <!ENTITY ssl-observatory.warning.okay "Eu entendo"> <!ENTITY ssl-observatory.warning.text "O Observatório SSL de EFF emitiu um aviso sobre o(s) certificados(s) HTTPS para este site:"> -<!ENTITY ssl-observatory.warning.defense "Se você estiver entrado neste site, é aconselhável trocar sua senha assim que você tiver uma conexão segura."> +<!ENTITY ssl-observatory.warning.defense "Se você estiver entrado neste site, é aconselhável trocar a sua senha assim que você tiver uma conexão segura."> <!ENTITY ssl-observatory.prefs.self_signed "Envie e verifique os certificados auto-assinados">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 22 Dec '13

22 Dec '13

commit 210596e736d424c0aa29b67eeaf0d74503504027 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 22 19:15:51 2013 +0000 Update translations for https_everywhere --- pt_BR/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index 54362fa..dac0edf 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -85,7 +85,7 @@ Passe o mouse sobre as opções para ver mais detalhes:"> <!ENTITY ssl-observatory.warning.showcert "Mostrar a série do certificado"> <!ENTITY ssl-observatory.warning.okay "Eu entendo"> <!ENTITY ssl-observatory.warning.text "O Observatório SSL de EFF emitiu um aviso sobre o(s) certificados(s) HTTPS para este site:"> -<!ENTITY ssl-observatory.warning.defense "Se você estiver entrado neste site, é aconselhável trocar sua senha assim que você tiver uma conexão segura."> +<!ENTITY ssl-observatory.warning.defense "Se você estiver entrado neste site, é aconselhável trocar a sua senha assim que você tiver uma conexão segura."> <!ENTITY ssl-observatory.prefs.self_signed "Envie e verifique os certificados auto-assinados">

1 0

r26508: {website} change to $10 per ticket 10435 (website/trunk/download/en)
by Andrew Lewman 22 Dec '13

22 Dec '13

Author: phobos Date: 2013-12-22 18:15:02 +0000 (Sun, 22 Dec 2013) New Revision: 26508 Modified: website/trunk/download/en/download-easy.wml Log: change to $10 per ticket 10435 Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2013-12-22 18:14:44 UTC (rev 26507) +++ website/trunk/download/en/download-easy.wml 2013-12-22 18:15:02 UTC (rev 26508) @@ -257,7 +257,7 @@ <option value="GBP">£</option> <option value="YEN">¥</option> </select> - <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> + <input type="text" id="amount" class="amount" name="amount" value="10" size="10"> </p> <p> <input type="hidden" id="a3" name="a3" value="0">

1 0

r26507: {website} change to $10 per ticket 10435 (website/trunk/donate/en)
by Andrew Lewman 22 Dec '13

22 Dec '13

Author: phobos Date: 2013-12-22 18:14:44 +0000 (Sun, 22 Dec 2013) New Revision: 26507 Modified: website/trunk/donate/en/donate.wml Log: change to $10 per ticket 10435 Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2013-12-22 18:09:45 UTC (rev 26506) +++ website/trunk/donate/en/donate.wml 2013-12-22 18:14:44 UTC (rev 26507) @@ -248,7 +248,7 @@ <li id="price" class="control-group"> <label class="control-label" style="width: 40px">Amount:</label> <div class="controls" style="margin-left: 60px"> - <input name="price" type="number" class="noscroll" value="5.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" style="width: 39%" /> + <input name="price" type="number" class="noscroll" value="10.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" style="width: 39%" /> <select name="currency" value="" style="width: 49%" > <option value="USD" selected="selected">USD</option> <option value="BTC">BTC</option>

1 0

r26506: {website} make the d-e donations text shorter (website/trunk/download/en)
by Andrew Lewman 22 Dec '13

22 Dec '13

Author: phobos Date: 2013-12-22 18:09:45 +0000 (Sun, 22 Dec 2013) New Revision: 26506 Modified: website/trunk/download/en/download-easy.wml Log: make the d-e donations text shorter Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2013-12-22 18:03:22 UTC (rev 26505) +++ website/trunk/download/en/download-easy.wml 2013-12-22 18:09:45 UTC (rev 26506) @@ -249,7 +249,7 @@ }); </script> <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <h2>Defend your privacy online!</h2> + <h2>Support more privacy!</h2> <p> <select name="currency_code" class="cur"> <option value="USD" selected="selected">$</option>

1 0

r26505: {website} change the text of the download-easy donation widget. (website/trunk/download/en)
by Andrew Lewman 22 Dec '13

22 Dec '13

Author: phobos Date: 2013-12-22 18:03:22 +0000 (Sun, 22 Dec 2013) New Revision: 26505 Modified: website/trunk/download/en/download-easy.wml Log: change the text of the download-easy donation widget. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2013-12-22 08:27:05 UTC (rev 26504) +++ website/trunk/download/en/download-easy.wml 2013-12-22 18:03:22 UTC (rev 26505) @@ -249,7 +249,7 @@ }); </script> <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <h2>Help create more Tor!</h2> + <h2>Defend your privacy online!</h2> <p> <select name="currency_code" class="cur"> <option value="USD" selected="selected">$</option>

1 0