April 2020 - tor-commits - lists.torproject.org

[tor/master] relay: Refactor can extend over IPv6 checks
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit 15a4180a7e041531d6923a41684e9e6ffc833760 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 06:47:46 2020 +1000 relay: Refactor can extend over IPv6 checks Split "can extend over IPv6" and "has advertised IPv6 ORPort" into separate functions. They currently have the same result, but this may change in 33818 with ExtendAllowIPv6Addresses. Part of 33817. --- src/feature/relay/circuitbuild_relay.c | 2 +- src/feature/relay/router.c | 13 +++++- src/feature/relay/router.h | 4 +- src/test/test_circuitbuild.c | 76 +++++++++++++++++----------------- 4 files changed, 52 insertions(+), 43 deletions(-) diff --git a/src/feature/relay/circuitbuild_relay.c b/src/feature/relay/circuitbuild_relay.c index 75b2767b8..b89866b47 100644 --- a/src/feature/relay/circuitbuild_relay.c +++ b/src/feature/relay/circuitbuild_relay.c @@ -251,7 +251,7 @@ STATIC const tor_addr_port_t * circuit_choose_ip_ap_for_extend(const tor_addr_port_t *ipv4_ap, const tor_addr_port_t *ipv6_ap) { - const bool ipv6_supported = router_has_advertised_ipv6_orport(get_options()); + const bool ipv6_supported = router_can_extend_over_ipv6(get_options()); /* If IPv6 is not supported, we can't use the IPv6 address. */ if (!ipv6_supported) { diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index b0a56012d..2858371af 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1491,14 +1491,23 @@ router_get_advertised_ipv6_or_ap(const or_options_t *options, } /** Returns true if this router has an advertised IPv6 ORPort. */ -MOCK_IMPL(bool, -router_has_advertised_ipv6_orport,(const or_options_t *options)) +bool +router_has_advertised_ipv6_orport(const or_options_t *options) { tor_addr_port_t ipv6_ap; router_get_advertised_ipv6_or_ap(options, &ipv6_ap); return tor_addr_port_is_valid_ap(&ipv6_ap, 0); } +/** Returns true if this router has an advertised IPv6 ORPort. */ +MOCK_IMPL(bool, +router_can_extend_over_ipv6,(const or_options_t *options)) +{ + /* We might add some extra checks here, such as ExtendAllowIPv6Addresses + * from ticket 33818. */ + return router_has_advertised_ipv6_orport(options); +} + /** Return the port that we should advertise as our DirPort; * this is one of three possibilities: * The one that is passed as <b>dirport</b> if the DirPort option is 0, or diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index 1a262a679..39c550dd2 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -68,8 +68,8 @@ uint16_t router_get_active_listener_port_by_type_af(int listener_type, uint16_t router_get_advertised_or_port(const or_options_t *options); void router_get_advertised_ipv6_or_ap(const or_options_t *options, tor_addr_port_t *ipv6_ap_out); -MOCK_DECL(bool, router_has_advertised_ipv6_orport,( - const or_options_t *options)); +bool router_has_advertised_ipv6_orport(const or_options_t *options); +MOCK_DECL(bool, router_can_extend_over_ipv6,(const or_options_t *options)); uint16_t router_get_advertised_or_port_by_af(const or_options_t *options, sa_family_t family); uint16_t router_get_advertised_dir_port(const or_options_t *options, diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c index ed75d102b..03fd176ea 100644 --- a/src/test/test_circuitbuild.c +++ b/src/test/test_circuitbuild.c @@ -821,14 +821,14 @@ test_circuit_extend_lspec_valid(void *arg) tor_free(p_chan); } -static bool router_has_ipv6_orport_result = false; -static int mock_router_ipv6_orport_calls = 0; +static bool can_extend_over_ipv6_result = false; +static int mock_router_can_extend_over_ipv6_calls = 0; static bool -mock_router_has_advertised_ipv6_orport(const or_options_t *options) +mock_router_can_extend_over_ipv6(const or_options_t *options) { (void)options; - mock_router_ipv6_orport_calls++; - return router_has_ipv6_orport_result; + mock_router_can_extend_over_ipv6_calls++; + return can_extend_over_ipv6_result; } /* Test the different cases in circuit_choose_ip_ap_for_extend(). */ @@ -849,65 +849,65 @@ test_circuit_choose_ip_ap_for_extend(void *arg) MOCK(get_options, mock_get_options); mocked_options = fake_options; - MOCK(router_has_advertised_ipv6_orport, - mock_router_has_advertised_ipv6_orport); - router_has_ipv6_orport_result = true; - mock_router_ipv6_orport_calls = 0; + MOCK(router_can_extend_over_ipv6, + mock_router_can_extend_over_ipv6); + can_extend_over_ipv6_result = true; + mock_router_can_extend_over_ipv6_calls = 0; /* No valid addresses */ - router_has_ipv6_orport_result = true; - mock_router_ipv6_orport_calls = 0; + can_extend_over_ipv6_result = true; + mock_router_can_extend_over_ipv6_calls = 0; tt_ptr_op(circuit_choose_ip_ap_for_extend(NULL, NULL), OP_EQ, NULL); - tt_int_op(mock_router_ipv6_orport_calls, OP_EQ, 1); + tt_int_op(mock_router_can_extend_over_ipv6_calls, OP_EQ, 1); - router_has_ipv6_orport_result = false; - mock_router_ipv6_orport_calls = 0; + can_extend_over_ipv6_result = false; + mock_router_can_extend_over_ipv6_calls = 0; tt_ptr_op(circuit_choose_ip_ap_for_extend(NULL, NULL), OP_EQ, NULL); - tt_int_op(mock_router_ipv6_orport_calls, OP_EQ, 1); + tt_int_op(mock_router_can_extend_over_ipv6_calls, OP_EQ, 1); /* One valid address: IPv4 */ - router_has_ipv6_orport_result = true; - mock_router_ipv6_orport_calls = 0; + can_extend_over_ipv6_result = true; + mock_router_can_extend_over_ipv6_calls = 0; tt_ptr_op(circuit_choose_ip_ap_for_extend(&ipv4_ap, NULL), OP_EQ, &ipv4_ap); - tt_int_op(mock_router_ipv6_orport_calls, OP_EQ, 1); + tt_int_op(mock_router_can_extend_over_ipv6_calls, OP_EQ, 1); - router_has_ipv6_orport_result = false; - mock_router_ipv6_orport_calls = 0; + can_extend_over_ipv6_result = false; + mock_router_can_extend_over_ipv6_calls = 0; tt_ptr_op(circuit_choose_ip_ap_for_extend(&ipv4_ap, NULL), OP_EQ, &ipv4_ap); - tt_int_op(mock_router_ipv6_orport_calls, OP_EQ, 1); + tt_int_op(mock_router_can_extend_over_ipv6_calls, OP_EQ, 1); /* One valid address: IPv6 */ - router_has_ipv6_orport_result = true; - mock_router_ipv6_orport_calls = 0; + can_extend_over_ipv6_result = true; + mock_router_can_extend_over_ipv6_calls = 0; tt_ptr_op(circuit_choose_ip_ap_for_extend(NULL, &ipv6_ap), OP_EQ, &ipv6_ap); - tt_int_op(mock_router_ipv6_orport_calls, OP_EQ, 1); + tt_int_op(mock_router_can_extend_over_ipv6_calls, OP_EQ, 1); - router_has_ipv6_orport_result = false; - mock_router_ipv6_orport_calls = 0; + can_extend_over_ipv6_result = false; + mock_router_can_extend_over_ipv6_calls = 0; tt_ptr_op(circuit_choose_ip_ap_for_extend(NULL, &ipv6_ap), OP_EQ, NULL); - tt_int_op(mock_router_ipv6_orport_calls, OP_EQ, 1); + tt_int_op(mock_router_can_extend_over_ipv6_calls, OP_EQ, 1); /* Two valid addresses */ const tor_addr_port_t *chosen_addr = NULL; - router_has_ipv6_orport_result = true; - mock_router_ipv6_orport_calls = 0; + can_extend_over_ipv6_result = true; + mock_router_can_extend_over_ipv6_calls = 0; chosen_addr = circuit_choose_ip_ap_for_extend(&ipv4_ap, &ipv6_ap); tt_assert(chosen_addr == &ipv4_ap || chosen_addr == &ipv6_ap); - tt_int_op(mock_router_ipv6_orport_calls, OP_EQ, 1); + tt_int_op(mock_router_can_extend_over_ipv6_calls, OP_EQ, 1); - router_has_ipv6_orport_result = false; - mock_router_ipv6_orport_calls = 0; + can_extend_over_ipv6_result = false; + mock_router_can_extend_over_ipv6_calls = 0; tt_ptr_op(circuit_choose_ip_ap_for_extend(&ipv4_ap, &ipv6_ap), OP_EQ, &ipv4_ap); - tt_int_op(mock_router_ipv6_orport_calls, OP_EQ, 1); + tt_int_op(mock_router_can_extend_over_ipv6_calls, OP_EQ, 1); done: UNMOCK(get_options); or_options_free(fake_options); mocked_options = NULL; - UNMOCK(router_has_advertised_ipv6_orport); + UNMOCK(router_can_extend_over_ipv6); tor_free(fake_options); } @@ -968,9 +968,9 @@ test_circuit_open_connection_for_extend(void *arg) mock_channel_connect_calls = 0; mock_channel_connect_nchan = NULL; - MOCK(router_has_advertised_ipv6_orport, - mock_router_has_advertised_ipv6_orport); - router_has_ipv6_orport_result = true; + MOCK(router_can_extend_over_ipv6, + mock_router_can_extend_over_ipv6); + can_extend_over_ipv6_result = true; setup_full_capture_of_logs(LOG_INFO); @@ -1110,7 +1110,7 @@ test_circuit_open_connection_for_extend(void *arg) or_options_free(fake_options); mocked_options = NULL; - UNMOCK(router_has_advertised_ipv6_orport); + UNMOCK(router_can_extend_over_ipv6); tor_free(ec); tor_free(circ->n_hop);

1 0

[tor/master] practracker: Allow an extra line in tor_addr_parse_mask_ports()
by nickm＠torproject.org 29 Apr '20

29 Apr '20

commit ed4420b4b8b891bd29587a27cb51e9184ff3e093 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 06:52:43 2020 +1000 practracker: Allow an extra line in tor_addr_parse_mask_ports() We added a cast, and wrapped a line. --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index cf2ec701e..bf37d476f 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -305,7 +305,7 @@ problem function-size /src/lib/encoding/confline.c:parse_config_line_from_str_ve problem function-size /src/lib/encoding/cstring.c:unescape_string() 108 problem function-size /src/lib/fs/dir.c:check_private_dir() 230 problem function-size /src/lib/math/prob_distr.c:sample_uniform_interval() 145 -problem function-size /src/lib/net/address.c:tor_addr_parse_mask_ports() 194 +problem function-size /src/lib/net/address.c:tor_addr_parse_mask_ports() 195 problem function-size /src/lib/net/address.c:tor_addr_compare_masked() 110 problem function-size /src/lib/net/inaddr.c:tor_inet_pton() 107 problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102

1 0

[meek/master] Remove d2zfqthxsdq309.cloudfront.net from the example torrc.
by dcf＠torproject.org 29 Apr '20

29 Apr '20

commit ec78bba23155908ba3a46eb4e06fa7753c249a76 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 29 13:23:42 2020 -0600 Remove d2zfqthxsdq309.cloudfront.net from the example torrc. --- meek-client/torrc | 1 - 1 file changed, 1 deletion(-) diff --git a/meek-client/torrc b/meek-client/torrc index dcac2f0..9272271 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -4,6 +4,5 @@ UseBridges 1 # Socks5Proxy localhost:1080 # HTTPSProxy localhost:8080 -Bridge meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com Bridge meek 0.0.2.0:3 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com ClientTransportPlugin meek exec ./meek-client --log meek-client.log

1 0

[meek/master] Do the go.mod thing.
by dcf＠torproject.org 29 Apr '20

29 Apr '20

commit 1b9883a620c9b12096c83809524b9f12076955bc Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 29 13:34:58 2020 -0600 Do the go.mod thing. --- go.mod | 11 +++++++++++ go.sum | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..1216057 --- /dev/null +++ b/go.mod @@ -0,0 +1,11 @@ +module git.torproject.org/pluggable-transports/meek.git + +go 1.13 + +require ( + git.torproject.org/pluggable-transports/goptlib.git v1.1.0 + github.com/refraction-networking/utls v0.0.0-20190909200633-43c36d3c1f57 + golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 + golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 + golang.org/x/sys v0.0.0-20200428200454-593003d681fa +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..effe803 --- /dev/null +++ b/go.sum @@ -0,0 +1,17 @@ +git.torproject.org/pluggable-transports/goptlib.git v1.1.0 h1:LMQAA8pAho+QtYrrVNimJQiINNEwcwuuD99vezD/PAo= +git.torproject.org/pluggable-transports/goptlib.git v1.1.0/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q= +github.com/refraction-networking/utls v0.0.0-20190909200633-43c36d3c1f57 h1:SL1K0QAuC1b54KoY1pjPWe6kSlsFHwK9/oC960fKrTY= +github.com/refraction-networking/utls v0.0.0-20190909200633-43c36d3c1f57/go.mod h1:tz9gX959MEFfFN5whTIocCLUG57WiILqtdVxI8c6Wj0= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88= +golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 h1:Jcxah/M+oLZ/R4/z5RzfPzGbPXnVDPkEDtf2JnuxN+U= +golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA= +golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

1 0

[meek/master] Update utls fingerprints
by dcf＠torproject.org 29 Apr '20

29 Apr '20

commit 9bd0572a639e0e33085496ecb9539c618229df0e Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 29 13:30:40 2020 -0600 Update utls fingerprints github.com/refraction-networking/utls Adds HelloFirefox_65 HelloChrome_72 HelloIOS_12_1 --- doc/meek-client.1 | 37 +++++++++++++++++++++++++++++++++++-- doc/meek-client.1.txt | 3 +++ meek-client/utls.go | 3 +++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/doc/meek-client.1 b/doc/meek-client.1 index 58fd755..8215537 100644 --- a/doc/meek-client.1 +++ b/doc/meek-client.1 @@ -2,12 +2,12 @@ .\" Title: meek-client .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 02/06/2019 +.\" Date: 04/29/2020 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MEEK\-CLIENT" "1" "02/06/2019" "\ \&" "\ \&" +.TH "MEEK\-CLIENT" "1" "04/29/2020" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -128,6 +128,17 @@ HelloFirefox_63 .sp -1 .IP \(bu 2.3 .\} +HelloFirefox_65 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} HelloFirefox_Auto .RE .sp @@ -172,6 +183,17 @@ HelloChrome_70 .sp -1 .IP \(bu 2.3 .\} +HelloChrome_72 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} HelloChrome_Auto .RE .sp @@ -194,6 +216,17 @@ HelloIOS_11_1 .sp -1 .IP \(bu 2.3 .\} +HelloIOS_12_1 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} HelloIOS_Auto .RE .sp diff --git a/doc/meek-client.1.txt b/doc/meek-client.1.txt index 33e2916..bd1ce5b 100644 --- a/doc/meek-client.1.txt +++ b/doc/meek-client.1.txt @@ -56,12 +56,15 @@ The possible values of __CLIENTHELLOID__ are: - HelloFirefox_55 - HelloFirefox_56 - HelloFirefox_63 +- HelloFirefox_65 - HelloFirefox_Auto - HelloChrome_58 - HelloChrome_62 - HelloChrome_70 +- HelloChrome_72 - HelloChrome_Auto - HelloIOS_11_1 +- HelloIOS_12_1 - HelloIOS_Auto As a special case, the values "none" and "HelloGolang" diff --git a/meek-client/utls.go b/meek-client/utls.go index 576eb26..e7f2b5f 100644 --- a/meek-client/utls.go +++ b/meek-client/utls.go @@ -263,12 +263,15 @@ var clientHelloIDMap = map[string]*utls.ClientHelloID{ "hellofirefox_55": &utls.HelloFirefox_55, "hellofirefox_56": &utls.HelloFirefox_56, "hellofirefox_63": &utls.HelloFirefox_63, + "hellofirefox_65": &utls.HelloFirefox_65, "hellochrome_auto": &utls.HelloChrome_Auto, "hellochrome_58": &utls.HelloChrome_58, "hellochrome_62": &utls.HelloChrome_62, "hellochrome_70": &utls.HelloChrome_70, + "hellochrome_72": &utls.HelloChrome_72, "helloios_auto": &utls.HelloIOS_Auto, "helloios_11_1": &utls.HelloIOS_11_1, + "helloios_12_1": &utls.HelloIOS_12_1, } func NewUTLSRoundTripper(name string, cfg *utls.Config, proxyURL *url.URL) (http.RoundTripper, error) {

1 0

[meek/master] Use Clone to make copies of http.DefaultTransport.
by dcf＠torproject.org 29 Apr '20

29 Apr '20

commit bc887de694bc2d2381af099d5c38f0e9efd76c4b Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 29 13:22:07 2020 -0600 Use Clone to make copies of http.DefaultTransport. Clone is new in go1.13. https://github.com/golang/go/issues/26013 --- meek-client/meek-client.go | 2 +- meek-client/utls.go | 28 +++------------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index f520a60..3431b53 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -82,7 +82,7 @@ const ( // We use this RoundTripper to make all our requests when neither --helper nor // utls is in effect. We use the defaults, except we take control of the Proxy // setting (notably, disabling the default ProxyFromEnvironment). -var httpRoundTripper *http.Transport = http.DefaultTransport.(*http.Transport) +var httpRoundTripper *http.Transport = http.DefaultTransport.(*http.Transport).Clone() // We use this RoundTripper when --helper is in effect. var helperRoundTripper = &HelperRoundTripper{ diff --git a/meek-client/utls.go b/meek-client/utls.go index 66b1a93..576eb26 100644 --- a/meek-client/utls.go +++ b/meek-client/utls.go @@ -39,7 +39,6 @@ import ( "net" "net/http" "net/url" - "reflect" "strings" "sync" @@ -48,25 +47,6 @@ import ( "golang.org/x/net/proxy" ) -// Copy the public fields (fields for which CanSet is true) from src to dst. -// src and dst must be pointers to the same type. We use this to make copies of -// httpRoundTripper. We cannot use struct assignment, because http.Transport -// contains private mutexes. The idea of using reflection to copy only the -// public fields comes from a post by Nick Craig-Wood: -// https://groups.google.com/d/msg/Golang-Nuts/SDiGYNVE8iY/89hRKTF4BAAJ -func copyPublicFields(dst, src interface{}) { - if reflect.TypeOf(dst) != reflect.TypeOf(src) { - panic("unequal types") - } - dstValue := reflect.ValueOf(dst).Elem() - srcValue := reflect.ValueOf(src).Elem() - for i := 0; i < dstValue.NumField(); i++ { - if dstValue.Field(i).CanSet() { - dstValue.Field(i).Set(srcValue.Field(i)) - } - } -} - // Extract a host:port address from a URL, suitable for passing to net.Dial. func addrForDial(url *url.URL) (string, error) { host := url.Hostname() @@ -264,9 +244,8 @@ func makeRoundTripper(url *url.URL, clientHelloID *utls.ClientHelloID, cfg *utls default: // With http.Transport, copy important default fields from // http.DefaultTransport, such as TLSHandshakeTimeout and - // IdleConnTimeout. - tr := &http.Transport{} - copyPublicFields(tr, httpRoundTripper) + // IdleConnTimeout, before overriding DialTLS. + tr := httpRoundTripper.Clone() tr.DialTLS = dialTLS return tr, nil } @@ -310,8 +289,7 @@ func NewUTLSRoundTripper(name string, cfg *utls.Config, proxyURL *url.URL) (http // This special-case RoundTripper is used for HTTP requests, which don't // use uTLS but should use the specified proxy. - httpRT := &http.Transport{} - copyPublicFields(httpRT, httpRoundTripper) + httpRT := httpRoundTripper.Clone() httpRT.Proxy = http.ProxyURL(proxyURL) return &UTLSRoundTripper{

1 0

[translation/mat-gui_completed] https://gitweb.torproject.org/translation.git/commit/?h=mat-gui_completed
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit 60bcd151b8fe101cf9b252a387c28a33cc3d59a3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 17:46:42 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=mat-gui_completed --- da.po | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/da.po b/da.po new file mode 100644 index 0000000000..cd093b7221 --- /dev/null +++ b/da.po @@ -0,0 +1,193 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Aesthese, 2016 +# Anders Damsgaard <andersd(a)riseup.net>, 2013 +# bna1605 <bna1605(a)gmail.com>, 2014 +# Caspar Christensen, 2013 +# mort3n <nalholm(a)yahoo.dk>, 2016 +# scootergrisen, 2017-2018,2020 +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2020-04-29 17:28+0000\n" +"Last-Translator: scootergrisen\n" +"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: da\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: mat-gui:66 mat-gui:422 mat-gui:445 +msgid "Ready" +msgstr "Klar" + +#: mat-gui:136 +msgid "Choose files" +msgstr "Vælg filer" + +#: mat-gui:144 +msgid "Supported files" +msgstr "Understøttede filer" + +#: mat-gui:151 +msgid "All files" +msgstr "Alle filer" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 +msgid "Clean" +msgstr "Rens" + +#: mat-gui:168 +msgid "No metadata found" +msgstr "Ingen metadata fundet" + +#: mat-gui:170 mat-gui:419 +msgid "Dirty" +msgstr "Ikke ren" + +#: mat-gui:176 +#, python-format +msgid "%s's metadata" +msgstr "%s's metadata" + +#: mat-gui:187 +msgid "Trash your meta, keep your data" +msgstr "Fjern dine metadata, behold dine rigtige data" + +#: mat-gui:192 +msgid "Website" +msgstr "Websted" + +#: mat-gui:219 +msgid "Preferences" +msgstr "Præferencer" + +#: mat-gui:232 +msgid "Reduce PDF quality" +msgstr "Reducer PDF-kvalitet" + +#: mat-gui:235 +msgid "Reduce the produced PDF size and quality" +msgstr "Reducer den producerede PDF-størrelse og -kvalitet" + +#: mat-gui:238 +msgid "Remove unsupported file from archives" +msgstr "Fjern fil der ikke understøttes fra arkiver" + +#: mat-gui:241 +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Fjern fil der ikke understøttes (og dermed ikke anonymiseret) fra outputarkiv" + +#: mat-gui:280 +msgid "Unknown" +msgstr "Ukendt" + +#: mat-gui:325 +msgid "Not-supported" +msgstr "Understøttes ikke" + +#: mat-gui:339 +msgid "Harmless fileformat" +msgstr "Harmløst filformat" + +#: mat-gui:341 +msgid "Cant read file" +msgstr "Kan ikke læse fil" + +#: mat-gui:343 +msgid "Fileformat not supported" +msgstr "Filformatet understøttes ikke" + +#: mat-gui:346 +msgid "These files can not be processed:" +msgstr "Disse filer kan ikke behandles:" + +#: mat-gui:351 mat-gui:380 data/mat.glade:239 +msgid "Filename" +msgstr "Filnavn" + +#: mat-gui:353 +msgid "Reason" +msgstr "Årsag" + +#: mat-gui:365 +msgid "Non-supported files in archive" +msgstr "Filer der ikke understøttes i arkiv" + +#: mat-gui:379 +msgid "Include" +msgstr "Inkludér" + +#: mat-gui:397 +#, python-format +msgid "MAT is not able to clean the following files, found in the %s archive" +msgstr "MAT er ikke i stand til at rense følgende filer som blev fundet i %s-arkivet" + +#: mat-gui:413 +#, python-format +msgid "Checking %s" +msgstr "Tjekker %s" + +#: mat-gui:428 +#, python-format +msgid "Cleaning %s" +msgstr "Renser %s" + +#: data/mat.glade:46 +msgid "_File" +msgstr "_Fil" + +#: data/mat.glade:95 +msgid "_Edit" +msgstr "_Rediger" + +#: data/mat.glade:141 +msgid "_Help" +msgstr "_Hjælp" + +#: data/mat.glade:187 +msgid "Add" +msgstr "Tilføj" + +#: data/mat.glade:256 +msgid "State" +msgstr "Tilstand" + +#: data/mat.glade:294 data/mat.glade:467 +msgid "Metadata" +msgstr "Metadata" + +#: data/mat.glade:354 +msgid "Name" +msgstr "Navn" + +#: data/mat.glade:368 +msgid "Content" +msgstr "Indhold" + +#: data/mat.glade:398 +msgid "Supported formats" +msgstr "Understøttede formater" + +#: data/mat.glade:456 +msgid "Support" +msgstr "Understøttelse" + +#: data/mat.glade:478 +msgid "Method" +msgstr "Metode" + +#: data/mat.glade:489 +msgid "Remaining" +msgstr "Tilbage" + +#: data/mat.glade:518 +msgid "Fileformat" +msgstr "Filformat"

1 0

[translation/mat-gui] https://gitweb.torproject.org/translation.git/commit/?h=mat-gui
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit da81acc40bfaa51c89c80cdfc5b36a9d95c62f26 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 17:46:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=mat-gui --- da.po | 86 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/da.po b/da.po index c82e093855..cd093b7221 100644 --- a/da.po +++ b/da.po @@ -8,13 +8,13 @@ # bna1605 <bna1605(a)gmail.com>, 2014 # Caspar Christensen, 2013 # mort3n <nalholm(a)yahoo.dk>, 2016 -# scootergrisen, 2017-2018 +# scootergrisen, 2017-2018,2020 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2019-03-20 18:18+0000\n" +"PO-Revision-Date: 2020-04-29 17:28+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -25,169 +25,169 @@ msgstr "" #: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" -msgstr "" +msgstr "Klar" #: mat-gui:136 msgid "Choose files" -msgstr "" +msgstr "Vælg filer" #: mat-gui:144 msgid "Supported files" -msgstr "" +msgstr "Understøttede filer" #: mat-gui:151 msgid "All files" -msgstr "" +msgstr "Alle filer" #: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 #: data/mat.glade:200 msgid "Clean" -msgstr "" +msgstr "Rens" #: mat-gui:168 msgid "No metadata found" -msgstr "" +msgstr "Ingen metadata fundet" #: mat-gui:170 mat-gui:419 msgid "Dirty" -msgstr "" +msgstr "Ikke ren" #: mat-gui:176 #, python-format msgid "%s's metadata" -msgstr "" +msgstr "%s's metadata" #: mat-gui:187 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "Fjern dine metadata, behold dine rigtige data" #: mat-gui:192 msgid "Website" -msgstr "" +msgstr "Websted" #: mat-gui:219 msgid "Preferences" -msgstr "" +msgstr "Præferencer" #: mat-gui:232 msgid "Reduce PDF quality" -msgstr "" +msgstr "Reducer PDF-kvalitet" #: mat-gui:235 msgid "Reduce the produced PDF size and quality" -msgstr "" +msgstr "Reducer den producerede PDF-størrelse og -kvalitet" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Fjern fil der ikke understøttes fra arkiver" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Fjern fil der ikke understøttes (og dermed ikke anonymiseret) fra outputarkiv" #: mat-gui:280 msgid "Unknown" -msgstr "" +msgstr "Ukendt" #: mat-gui:325 msgid "Not-supported" -msgstr "" +msgstr "Understøttes ikke" #: mat-gui:339 msgid "Harmless fileformat" -msgstr "" +msgstr "Harmløst filformat" #: mat-gui:341 msgid "Cant read file" -msgstr "" +msgstr "Kan ikke læse fil" #: mat-gui:343 msgid "Fileformat not supported" -msgstr "" +msgstr "Filformatet understøttes ikke" #: mat-gui:346 msgid "These files can not be processed:" -msgstr "" +msgstr "Disse filer kan ikke behandles:" #: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" -msgstr "" +msgstr "Filnavn" #: mat-gui:353 msgid "Reason" -msgstr "" +msgstr "Årsag" #: mat-gui:365 msgid "Non-supported files in archive" -msgstr "" +msgstr "Filer der ikke understøttes i arkiv" #: mat-gui:379 msgid "Include" -msgstr "" +msgstr "Inkludér" #: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" -msgstr "" +msgstr "MAT er ikke i stand til at rense følgende filer som blev fundet i %s-arkivet" #: mat-gui:413 #, python-format msgid "Checking %s" -msgstr "" +msgstr "Tjekker %s" #: mat-gui:428 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "Renser %s" #: data/mat.glade:46 msgid "_File" -msgstr "" +msgstr "_Fil" #: data/mat.glade:95 msgid "_Edit" -msgstr "" +msgstr "_Rediger" #: data/mat.glade:141 msgid "_Help" -msgstr "" +msgstr "_Hjælp" #: data/mat.glade:187 msgid "Add" -msgstr "" +msgstr "Tilføj" #: data/mat.glade:256 msgid "State" -msgstr "" +msgstr "Tilstand" #: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" -msgstr "" +msgstr "Metadata" #: data/mat.glade:354 msgid "Name" -msgstr "" +msgstr "Navn" #: data/mat.glade:368 msgid "Content" -msgstr "" +msgstr "Indhold" #: data/mat.glade:398 msgid "Supported formats" -msgstr "" +msgstr "Understøttede formater" #: data/mat.glade:456 msgid "Support" -msgstr "" +msgstr "Understøttelse" #: data/mat.glade:478 msgid "Method" -msgstr "" +msgstr "Metode" #: data/mat.glade:489 msgid "Remaining" -msgstr "" +msgstr "Tilbage" #: data/mat.glade:518 msgid "Fileformat" -msgstr "" +msgstr "Filformat"

1 0

[tpo/master] Add id for #board - fix #47
by gus＠torproject.org 29 Apr '20

29 Apr '20

commit fc62d077f4f87222bce1ec344f2d349b0d94c60c Author: gus <gus(a)torproject.org> Date: Tue Apr 28 22:52:31 2020 -0400 Add id for #board - fix #47 --- templates/people.html | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/templates/people.html b/templates/people.html index 1e0e4565..821a27b2 100644 --- a/templates/people.html +++ b/templates/people.html @@ -1,14 +1,16 @@ -<div class="container py-3"> - <a class="text-primary display-5" href="#board">{{ _('Board of Directors') }}</a> - <a class="text-primary display-5 pl-5" href="#core">{{ _('Core Tor') }}</a> -</div> -<div class="container-fluid"> - <div class="row"> - {% from "macros/people.html" import render_board %} - {% set items = site.query('/about/people').include_undiscoverable(true).filter(F.role == 'board') %} - {% for item in items %} - {{ render_board(item, this.alt) }} - {% endfor %} +<div id="board"> + <div class="container py-3"> + <a class="text-primary display-5" href="#board">{{ _('Board of Directors') }}</a> + <a class="text-primary display-5 pl-5" href="#core">{{ _('Core Tor') }}</a> + </div> + <div class="container-fluid"> + <div class="row"> + {% from "macros/people.html" import render_board %} + {% set items = site.query('/about/people').include_undiscoverable(true).filter(F.role == 'board') %} + {% for item in items %} + {{ render_board(item, this.alt) }} + {% endfor %} + </div> </div> </div> <div id="core" class="container py-3">

1 0

[tpo/master] Update volunteer and relay guide links to community portal - Fix #70
by gus＠torproject.org 29 Apr '20

29 Apr '20

commit 27d985d40b9d06f633d1a8216c98dcf55bf6336b Author: gus <gus(a)torproject.org> Date: Tue Apr 28 23:44:56 2020 -0400 Update volunteer and relay guide links to community portal - Fix #70 --- templates/thank-you.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/thank-you.html b/templates/thank-you.html index 56d08356..0c9f8d3e 100644 --- a/templates/thank-you.html +++ b/templates/thank-you.html @@ -18,11 +18,11 @@ </div> <div class="col-md-4"> <i class="h3 py-3 fas fa-cube-png"></i> - <h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> + <h4><a href="https://community.torproject.org/relay">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> </div> <div class="col-md-4"> <i class="h3 py-3 fas fa-hands-helping-png"></i> - <h4><a href="https://torproject.org/volunteer">{{ _('Use your skills to volunteer.') }}</a></h4> + <h4><a href="https://community.torproject.org/">{{ _('Use your skills to volunteer.') }}</a></h4> </div> </div> </div>

1 0