November 2015 - tor-commits - lists.torproject.org

[webwml/master] Give the footer a bit more space
by sebastian＠torproject.org 25 Nov '15

25 Nov '15

commit 7debd7b84d01160fc48e675642372687f5b04f59 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 25 16:50:50 2015 +0100 Give the footer a bit more space --- include/donatehead.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index d0c20a4..8d0b35c 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -48,7 +48,7 @@ .donation{ text-align: center; - padding-bottom: 60px; + padding-bottom: 65px; } h6{

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 25 Nov '15

25 Nov '15

commit d616b7c1c02c54630fb7d492a9c7121053d5a7d6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 25 15:15:03 2015 +0000 Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po index 9297187..e1c1e91 100644 --- a/th/LC_MESSAGES/bridgedb.po +++ b/th/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-11-25 14:44+0000\n" +"PO-Revision-Date: 2015-11-25 14:46+0000\n" "Last-Translator: Ella Rudland <atwwtkp(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -160,7 +160,7 @@ msgstr "%sไช่%s" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sเอา%sบริดจฺมา" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 25 Nov '15

25 Nov '15

commit 44da95f133260ea78f18c2570eac9e993b9d3e23 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 25 14:45:03 2015 +0000 Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po index fe8b54b..9297187 100644 --- a/th/LC_MESSAGES/bridgedb.po +++ b/th/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-11-25 14:02+0000\n" +"PO-Revision-Date: 2015-11-25 14:44+0000\n" "Last-Translator: Ella Rudland <atwwtkp(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -98,7 +98,7 @@ msgstr "ท่านควรจะลองดู %s กลับ %s เลื #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "ลำดับ%s1%s" #: bridgedb/https/templates/index.html:13 #, python-format @@ -108,7 +108,7 @@ msgstr "ดาวน์' โลด %s Tor เบราว์เซอร์ %s" #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "ลำดับ%s2%s" #: bridgedb/https/templates/index.html:27 #, python-format @@ -118,7 +118,7 @@ msgstr "เอา %s บริดจ์ มา %s" #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "ลำดับ%s3%s" #: bridgedb/https/templates/index.html:38 #, python-format @@ -132,7 +132,7 @@ msgstr "แล้ว %s บริดจ์ไ ใส่เพิ่มให้ #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sเอา%sบริดจฺให้ฉันเท่านั้น!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -152,7 +152,7 @@ msgstr "เปล่า" #: bridgedb/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sไช่%s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -270,7 +270,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "อีกวิธีรับบริดจฺหนึ่งคือส่งอีเมลให้ %s โปรดเข้าใจว่าคุณต้อง\nส่งอีเมลด้วยอีเมลจากบริการอีเมลซึ่งตามมา:\n%s %s หรือ %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!"

1 0

[tor/master] Attempt to make openbsd compilation happier with libevent2 installed
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 5dff4ae0ad5e2a1fb93ceae3446f0a315fbd8a3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 09:43:12 2015 -0500 Attempt to make openbsd compilation happier with libevent2 installed Fix for bug 16651; patch from "rubiate". --- changes/bug16651 | 5 +++++ configure.ac | 21 +++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/changes/bug16651 b/changes/bug16651 new file mode 100644 index 0000000..096daea --- /dev/null +++ b/changes/bug16651 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + + - Fix search for libevent libraries on OpenBSD (and similar systems + which install libevent 1 and libevent 2 in parallel). Resolves + ticket 16651. Patch from "rubiate". diff --git a/configure.ac b/configure.ac index 868ff55..82b933a 100644 --- a/configure.ac +++ b/configure.ac @@ -501,9 +501,6 @@ AC_CHECK_MEMBERS([struct event.min_heap_idx], , , AC_CHECK_HEADERS(event2/event.h event2/dns.h event2/bufferevent_ssl.h) LIBS="$save_LIBS" -LDFLAGS="$save_LDFLAGS" -CPPFLAGS="$save_CPPFLAGS" - AM_CONDITIONAL(USE_EXTERNAL_EVDNS, test x$ac_cv_header_event2_dns_h = xyes) @@ -514,9 +511,25 @@ if test "$enable_static_libevent" = "yes"; then TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a $STATIC_LIBEVENT_FLAGS" fi else - TOR_LIBEVENT_LIBS="-levent" + if test x$ac_cv_header_event2_event_h = "xyes"; then + AC_SEARCH_LIBS(event_new, [event event_core]) + AC_SEARCH_LIBS(evdns_base_new, [event event_extra]) + + if test $ac_cv_search_event_new != "none required"; then + TOR_LIBEVENT_LIBS="$ac_cv_search_event_new" + fi + if test $ac_cv_search_evdns_base_new != "none required"; then + TOR_LIBEVENT_LIBS="$ac_cv_search_evdns_base_new $TOR_LIBEVENT_LIBS" + fi + else + TOR_LIBEVENT_LIBS="-levent" + fi fi +LIBS="$save_LIBS" +LDFLAGS="$save_LDFLAGS" +CPPFLAGS="$save_CPPFLAGS" + dnl This isn't the best test for Libevent 2.0.3-alpha. Once it's released, dnl we can do much better. if test "$enable_bufferevents" = "yes" ; then

1 0

[tor/master] Initialize libevent before periodic events
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit c59c622d8590c4abed6b8095a7451e2ba4d9200a Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Nov 25 15:20:07 2015 +0100 Initialize libevent before periodic events The initialization of libevent interferes with other tests so we also fork the circuit_timeout test. --- src/test/test.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/test.c b/src/test/test.c index 0bc6292..1c4c292 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -319,6 +319,11 @@ test_circuit_timeout(void *arg) int i, runs; double close_ms; (void)arg; + tor_libevent_cfg cfg; + + memset(&cfg, 0, sizeof(cfg)); + + tor_libevent_initialize(&cfg); initialize_periodic_events(); circuit_build_times_init(&initial); @@ -1114,7 +1119,7 @@ static struct testcase_t test_array[] = { { "bad_onion_handshake", test_bad_onion_handshake, 0, NULL, NULL }, ENT(onion_queues), { "ntor_handshake", test_ntor_handshake, 0, NULL, NULL }, - ENT(circuit_timeout), + FORK(circuit_timeout), FORK(rend_fns), ENT(geoip), FORK(geoip_with_pt),

1 0

[tor/master] fixup! Block OutboundBindAddressIPv[4|6]_ and configured ports on exit relays
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit a09e7cd31a16244793c0848321c25e9cf6d8046f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Nov 23 08:38:32 2015 +1100 fixup! Block OutboundBindAddressIPv[4|6]_ and configured ports on exit relays Fix unit tests for get_interface_address6_list to assume less about the interface addresses on the system. Instead, mock get_interface_address6_list and use the mocked function to provide a range of address combinations. --- src/test/test_policy.c | 91 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 6 deletions(-) diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 52360f3..63672ea 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -692,8 +692,44 @@ test_policies_reject_port_address(void *arg) UNMOCK(get_configured_ports); } -#undef TEST_IPV4_ADDR -#undef TEST_IPV6_ADDR +smartlist_t *mock_ipv4_addrs = NULL; +smartlist_t *mock_ipv6_addrs = NULL; + +/* mock get_interface_address6_list, returning a deep copy of the template + * address list ipv4_interface_address_list or ipv6_interface_address_list */ +static smartlist_t * +mock_get_interface_address6_list(int severity, + sa_family_t family, + int include_internal) +{ + (void)severity; + (void)include_internal; + smartlist_t *clone_list = smartlist_new(); + smartlist_t *template_list = NULL; + + if (family == AF_INET) { + template_list = mock_ipv4_addrs; + } else if (family == AF_INET6) { + template_list = mock_ipv6_addrs; + } else { + return NULL; + } + + tt_assert(template_list); + + SMARTLIST_FOREACH_BEGIN(template_list, tor_addr_t *, src_addr) { + tor_addr_t *dest_addr = malloc(sizeof(tor_addr_t)); + memset(dest_addr, 0, sizeof(*dest_addr)); + tor_addr_copy_tight(dest_addr, src_addr); + smartlist_add(clone_list, dest_addr); + } SMARTLIST_FOREACH_END(src_addr); + + return clone_list; + + done: + free_interface_address6_list(clone_list); + return NULL; +} /** Run unit tests for rejecting publicly routable interface addresses on this * exit relay using policies_parse_exit_policy_reject_private */ @@ -705,6 +741,7 @@ test_policies_reject_interface_address(void *arg) get_interface_address6_list(LOG_INFO, AF_INET, 0); smartlist_t *public_ipv6_addrs = get_interface_address6_list(LOG_INFO, AF_INET6, 0); + tor_addr_t ipv4_addr, ipv6_addr; (void)arg; /* test that no addresses are rejected when none are supplied/requested */ @@ -712,30 +749,72 @@ test_policies_reject_interface_address(void *arg) tt_assert(policy == NULL); /* test that only IPv4 interface addresses are rejected on an IPv4-only exit + * (and allow for duplicates) */ policies_parse_exit_policy_reject_private(&policy, 0, NULL, 1, 0); if (policy) { - tt_assert(smartlist_len(policy) == smartlist_len(public_ipv4_addrs)); + tt_assert(smartlist_len(policy) <= smartlist_len(public_ipv4_addrs)); addr_policy_list_free(policy); policy = NULL; } /* test that IPv4 and IPv6 interface addresses are rejected on an IPv4/IPv6 - * exit */ - policies_parse_exit_policy_reject_private(&policy, 0, NULL, 1, 0); + * exit (and allow for duplicates) */ + policies_parse_exit_policy_reject_private(&policy, 1, NULL, 1, 0); if (policy) { - tt_assert(smartlist_len(policy) == (smartlist_len(public_ipv4_addrs) + tt_assert(smartlist_len(policy) <= (smartlist_len(public_ipv4_addrs) + smartlist_len(public_ipv6_addrs))); addr_policy_list_free(policy); policy = NULL; } + /* Now do it all again, but mocked */ + tor_addr_from_ipv4h(&ipv4_addr, TEST_IPV4_ADDR); + mock_ipv4_addrs = smartlist_new(); + smartlist_add(mock_ipv4_addrs, (void *)&ipv4_addr); + + tor_addr_parse(&ipv6_addr, TEST_IPV6_ADDR); + mock_ipv6_addrs = smartlist_new(); + smartlist_add(mock_ipv6_addrs, (void *)&ipv6_addr); + + MOCK(get_interface_address6_list, mock_get_interface_address6_list); + + /* test that no addresses are rejected when none are supplied/requested */ + policies_parse_exit_policy_reject_private(&policy, 0, NULL, 0, 0); + tt_assert(policy == NULL); + + /* test that only IPv4 interface addresses are rejected on an IPv4-only exit + */ + policies_parse_exit_policy_reject_private(&policy, 0, NULL, 1, 0); + tt_assert(policy); + tt_assert(smartlist_len(policy) == smartlist_len(mock_ipv4_addrs)); + addr_policy_list_free(policy); + policy = NULL; + + /* test that IPv4 and IPv6 interface addresses are rejected on an IPv4/IPv6 + * exit */ + policies_parse_exit_policy_reject_private(&policy, 1, NULL, 1, 0); + tt_assert(policy); + tt_assert(smartlist_len(policy) == (smartlist_len(mock_ipv4_addrs) + + smartlist_len(mock_ipv6_addrs))); + addr_policy_list_free(policy); + policy = NULL; + done: addr_policy_list_free(policy); free_interface_address6_list(public_ipv4_addrs); free_interface_address6_list(public_ipv6_addrs); + + UNMOCK(get_interface_address6_list); + /* we don't use free_interface_address6_list on these lists because their + * address pointers are stack-based */ + smartlist_free(mock_ipv4_addrs); + smartlist_free(mock_ipv6_addrs); } +#undef TEST_IPV4_ADDR +#undef TEST_IPV6_ADDR + static void test_dump_exit_policy_to_string(void *arg) {

1 0

[tor/master] Include netinet/in.h (if detected) in check for net/pfvar.h
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 232ccc18c40f0d0302b2e21b0f67885c548f8e63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 09:27:52 2015 -0500 Include netinet/in.h (if detected) in check for net/pfvar.h Patch from rubiate; fixes bug 17551. --- changes/bug17551 | 4 ++++ configure.ac | 3 +++ 2 files changed, 7 insertions(+) diff --git a/changes/bug17551 b/changes/bug17551 new file mode 100644 index 0000000..27e4679 --- /dev/null +++ b/changes/bug17551 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - When checking for net/pfvar.h, include netinet/in.h if possible. + This fixes transparent proxy detection on OpenBSD. Fixes bug + 17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate". diff --git a/configure.ac b/configure.ac index 06d03ae..3236a81 100644 --- a/configure.ac +++ b/configure.ac @@ -971,6 +971,9 @@ AC_CHECK_HEADERS(net/pfvar.h, net_pfvar_found=1, net_pfvar_found=0, #endif #ifdef HAVE_NET_IF_H #include <net/if.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> #endif]) AC_CHECK_HEADERS(linux/if.h,[],[],

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 62aad9c0b6812d04cfca3ec9e104d8ee2cbebb7c Merge: fe8eb9b 232ccc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 09:28:44 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17551 | 4 ++++ configure.ac | 3 +++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.2.7] Include netinet/in.h (if detected) in check for net/pfvar.h
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 232ccc18c40f0d0302b2e21b0f67885c548f8e63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 09:27:52 2015 -0500 Include netinet/in.h (if detected) in check for net/pfvar.h Patch from rubiate; fixes bug 17551. --- changes/bug17551 | 4 ++++ configure.ac | 3 +++ 2 files changed, 7 insertions(+) diff --git a/changes/bug17551 b/changes/bug17551 new file mode 100644 index 0000000..27e4679 --- /dev/null +++ b/changes/bug17551 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - When checking for net/pfvar.h, include netinet/in.h if possible. + This fixes transparent proxy detection on OpenBSD. Fixes bug + 17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate". diff --git a/configure.ac b/configure.ac index 06d03ae..3236a81 100644 --- a/configure.ac +++ b/configure.ac @@ -971,6 +971,9 @@ AC_CHECK_HEADERS(net/pfvar.h, net_pfvar_found=1, net_pfvar_found=0, #endif #ifdef HAVE_NET_IF_H #include <net/if.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> #endif]) AC_CHECK_HEADERS(linux/if.h,[],[],

1 0

[tor/master] Don't relaunch dir requests recursively if connection_connect() returns -1
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit dc0d2b59706d036b97451dc1f8addc86ed783c2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 09:40:05 2015 -0500 Don't relaunch dir requests recursively if connection_connect() returns -1 Closes ticket 17589. --- changes/bug17589 | 7 +++++++ src/or/directory.c | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug17589 b/changes/bug17589 new file mode 100644 index 0000000..9110327 --- /dev/null +++ b/changes/bug17589 @@ -0,0 +1,7 @@ + o Code simplificiation and refactoring: + - When a direct directory request fails immediately on launch, + instead of relaunching that request from inside the code that + launches it, instead mark the connection for teardown. This + change simplifies Tor's callback and prevents the directory- + request launching code from invoking itself recursively. + Closes ticket 17589. \ No newline at end of file diff --git a/src/or/directory.c b/src/or/directory.c index 6f8edb5..8d4c0a8 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -991,10 +991,7 @@ directory_initiate_command_rend(const tor_addr_t *_addr, switch (connection_connect(TO_CONN(conn), conn->base_.address, &addr, dir_port, &socket_error)) { case -1: - connection_dir_request_failed(conn); /* retry if we want */ - /* XXX we only pass 'conn' above, not 'resource', 'payload', - * etc. So in many situations it can't retry! -RD */ - connection_free(TO_CONN(conn)); + connection_mark_for_close(TO_CONN(conn)); return; case 1: /* start flushing conn */

1 0