August 2018 - tor-commits - lists.torproject.org

[tor/maint-0.2.9] Rewrite test_tortls_cert_matches_key()
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit 85a87923440361bc5a3b82c6e874192ebe08b8d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 20 17:43:41 2018 -0400 Rewrite test_tortls_cert_matches_key() Unlike the old test, this test no will no longer mess around with the forbidden internals of any openssl data structures. Additionally, it verifies several other behaviors of tor_tls_cert_matches_key() that we had wanted to verify, such as the possibility of the certificate's key not matching. Fixes bug 27226; bugfix on 0.2.5.1-alpha. --- changes/bug27226 | 5 +++ src/test/test_tortls.c | 119 +++++++++++++++++++++++++------------------------ 2 files changed, 65 insertions(+), 59 deletions(-) diff --git a/changes/bug27226 b/changes/bug27226 new file mode 100644 index 000000000..9030773cd --- /dev/null +++ b/changes/bug27226 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, openssl compatibility): + - Our "tortls/cert_matches_key" unit test no longer relies on OpenSSL + internals. Previously, it relied on unsupported OpenSSL behavior in + a way that caused it to crash with OpenSSL 1.0.2p. Fixes bug 27226; + bugfix on 0.2.5.1-alpha. diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 47455cff8..b0aec88ec 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -546,13 +546,6 @@ test_tortls_x509_cert_get_id_digests(void *ignored) } #ifndef OPENSSL_OPAQUE -static int -fixed_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) -{ - (void) a; (void) b; - return 1; -} - static void fake_x509_free(X509 *cert) { @@ -569,70 +562,78 @@ fake_x509_free(X509 *cert) tor_free(cert); } } +#endif + +static tor_x509_cert_t *fixed_x509_cert = NULL; +static tor_x509_cert_t * +get_peer_cert_mock_return_fixed(tor_tls_t *tls) +{ + (void)tls; + if (fixed_x509_cert) + return tor_x509_cert_dup(fixed_x509_cert); + else + return NULL; +} static void test_tortls_cert_matches_key(void *ignored) { (void)ignored; - int res; - tor_tls_t *tls; - tor_x509_cert_t *cert; - X509 *one = NULL, *two = NULL; - EVP_PKEY_ASN1_METHOD *meth = EVP_PKEY_asn1_new(999, 0, NULL, NULL); - EVP_PKEY_asn1_set_public(meth, NULL, NULL, fixed_pub_cmp, NULL, NULL, NULL); - tls = tor_malloc_zero(sizeof(tor_tls_t)); - cert = tor_malloc_zero(sizeof(tor_x509_cert_t)); - one = tor_malloc_zero(sizeof(X509)); - one->references = 1; - two = tor_malloc_zero(sizeof(X509)); - two->references = 1; + X509 *cert1 = NULL, *cert2 = NULL, *cert3 = NULL, *cert4 = NULL; + tor_x509_cert_t *c1 = NULL, *c2 = NULL, *c3 = NULL, *c4 = NULL; + crypto_pk_t *k1 = NULL, *k2 = NULL, *k3 = NULL; - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 0); + k1 = pk_generate(1); + k2 = pk_generate(2); + k3 = pk_generate(3); - tls->ssl = tor_malloc_zero(sizeof(SSL)); - tls->ssl->session = tor_malloc_zero(sizeof(SSL_SESSION)); - tls->ssl->session->peer = one; - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 0); - - cert->cert = two; - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 0); - - one->cert_info = tor_malloc_zero(sizeof(X509_CINF)); - one->cert_info->key = tor_malloc_zero(sizeof(X509_PUBKEY)); - one->cert_info->key->pkey = tor_malloc_zero(sizeof(EVP_PKEY)); - one->cert_info->key->pkey->references = 1; - one->cert_info->key->pkey->ameth = meth; - one->cert_info->key->pkey->type = 1; - - two->cert_info = tor_malloc_zero(sizeof(X509_CINF)); - two->cert_info->key = tor_malloc_zero(sizeof(X509_PUBKEY)); - two->cert_info->key->pkey = tor_malloc_zero(sizeof(EVP_PKEY)); - two->cert_info->key->pkey->references = 1; - two->cert_info->key->pkey->ameth = meth; - two->cert_info->key->pkey->type = 2; - - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 0); - - one->cert_info->key->pkey->type = 1; - two->cert_info->key->pkey->type = 1; - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 1); + cert1 = tor_tls_create_certificate(k1, k2, "A", "B", 1000); + cert2 = tor_tls_create_certificate(k1, k3, "C", "D", 1000); + cert3 = tor_tls_create_certificate(k2, k3, "C", "D", 1000); + cert4 = tor_tls_create_certificate(k3, k2, "E", "F", 1000); + + tt_assert(cert1 && cert2 && cert3 && cert4); + + c1 = tor_x509_cert_new(cert1); cert1 = NULL; + c2 = tor_x509_cert_new(cert2); cert2 = NULL; + c3 = tor_x509_cert_new(cert3); cert3 = NULL; + c4 = tor_x509_cert_new(cert4); cert4 = NULL; + + tt_assert(c1 && c2 && c3 && c4); + + MOCK(tor_tls_get_peer_cert, get_peer_cert_mock_return_fixed); + + fixed_x509_cert = NULL; + /* If the peer has no certificate, it shouldn't match anything. */ + tt_assert(! tor_tls_cert_matches_key(NULL, c1)); + tt_assert(! tor_tls_cert_matches_key(NULL, c2)); + tt_assert(! tor_tls_cert_matches_key(NULL, c3)); + tt_assert(! tor_tls_cert_matches_key(NULL, c4)); + fixed_x509_cert = c1; + /* If the peer has a certificate, it should match every cert with the same + * subject key. */ + tt_assert(tor_tls_cert_matches_key(NULL, c1)); + tt_assert(tor_tls_cert_matches_key(NULL, c2)); + tt_assert(! tor_tls_cert_matches_key(NULL, c3)); + tt_assert(! tor_tls_cert_matches_key(NULL, c4)); done: - EVP_PKEY_asn1_free(meth); - tor_free(tls->ssl->session); - tor_free(tls->ssl); - tor_free(tls); - tor_free(cert); - fake_x509_free(one); - fake_x509_free(two); + tor_x509_cert_free(c1); + tor_x509_cert_free(c2); + tor_x509_cert_free(c3); + tor_x509_cert_free(c4); + if (cert1) X509_free(cert1); + if (cert2) X509_free(cert2); + if (cert3) X509_free(cert3); + if (cert4) X509_free(cert4); + crypto_pk_free(k1); + crypto_pk_free(k2); + crypto_pk_free(k3); + UNMOCK(tor_tls_get_peer_cert); } +#ifndef OPENSSL_OPAQUE static void test_tortls_cert_get_key(void *ignored) {

1 0

[tor/maint-0.2.9] Use our x509 wrapper code in tor_tls_cert_matches_key()
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit c1f476a3d59a66e39302b51f6f937aabf0b3a0d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 20 17:42:38 2018 -0400 Use our x509 wrapper code in tor_tls_cert_matches_key() This allows us to mock our own tor_tls_get_peer_certificate() function in order to test ..cert_matches_key(), which will in turn allow us to simplify test_tortls_cert_matches_key() considerably. Prep work for the fix for 27226. --- src/common/tortls.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index a4e188603..4cbe8b10e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -857,18 +857,20 @@ tor_tls_cert_get_key(tor_x509_cert_t *cert) MOCK_IMPL(int, tor_tls_cert_matches_key,(const tor_tls_t *tls, const tor_x509_cert_t *cert)) { - X509 *peercert = SSL_get_peer_certificate(tls->ssl); + tor_x509_cert_t *peer = tor_tls_get_peer_cert((tor_tls_t *)tls); + if (!peer) + return 0; + + X509 *peercert = peer->cert; EVP_PKEY *link_key = NULL, *cert_key = NULL; int result; - if (!peercert) - return 0; link_key = X509_get_pubkey(peercert); cert_key = X509_get_pubkey(cert->cert); result = link_key && cert_key && EVP_PKEY_cmp(cert_key, link_key) == 1; - X509_free(peercert); + tor_x509_cert_free(peer); if (link_key) EVP_PKEY_free(link_key); if (cert_key)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit d52f406001082474c3decf04747bf6f742b82c96 Merge: c798957b5 85a879234 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 19:16:40 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27226 | 5 +++ src/common/tortls.c | 10 +++-- src/test/test_tortls.c | 119 +++++++++++++++++++++++++------------------------ 3 files changed, 71 insertions(+), 63 deletions(-)

1 0

[tor/maint-0.3.2] Use our x509 wrapper code in tor_tls_cert_matches_key()
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit c1f476a3d59a66e39302b51f6f937aabf0b3a0d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 20 17:42:38 2018 -0400 Use our x509 wrapper code in tor_tls_cert_matches_key() This allows us to mock our own tor_tls_get_peer_certificate() function in order to test ..cert_matches_key(), which will in turn allow us to simplify test_tortls_cert_matches_key() considerably. Prep work for the fix for 27226. --- src/common/tortls.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index a4e188603..4cbe8b10e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -857,18 +857,20 @@ tor_tls_cert_get_key(tor_x509_cert_t *cert) MOCK_IMPL(int, tor_tls_cert_matches_key,(const tor_tls_t *tls, const tor_x509_cert_t *cert)) { - X509 *peercert = SSL_get_peer_certificate(tls->ssl); + tor_x509_cert_t *peer = tor_tls_get_peer_cert((tor_tls_t *)tls); + if (!peer) + return 0; + + X509 *peercert = peer->cert; EVP_PKEY *link_key = NULL, *cert_key = NULL; int result; - if (!peercert) - return 0; link_key = X509_get_pubkey(peercert); cert_key = X509_get_pubkey(cert->cert); result = link_key && cert_key && EVP_PKEY_cmp(cert_key, link_key) == 1; - X509_free(peercert); + tor_x509_cert_free(peer); if (link_key) EVP_PKEY_free(link_key); if (cert_key)

1 0

[tor/maint-0.3.2] Rewrite test_tortls_cert_matches_key()
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit 85a87923440361bc5a3b82c6e874192ebe08b8d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 20 17:43:41 2018 -0400 Rewrite test_tortls_cert_matches_key() Unlike the old test, this test no will no longer mess around with the forbidden internals of any openssl data structures. Additionally, it verifies several other behaviors of tor_tls_cert_matches_key() that we had wanted to verify, such as the possibility of the certificate's key not matching. Fixes bug 27226; bugfix on 0.2.5.1-alpha. --- changes/bug27226 | 5 +++ src/test/test_tortls.c | 119 +++++++++++++++++++++++++------------------------ 2 files changed, 65 insertions(+), 59 deletions(-) diff --git a/changes/bug27226 b/changes/bug27226 new file mode 100644 index 000000000..9030773cd --- /dev/null +++ b/changes/bug27226 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, openssl compatibility): + - Our "tortls/cert_matches_key" unit test no longer relies on OpenSSL + internals. Previously, it relied on unsupported OpenSSL behavior in + a way that caused it to crash with OpenSSL 1.0.2p. Fixes bug 27226; + bugfix on 0.2.5.1-alpha. diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 47455cff8..b0aec88ec 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -546,13 +546,6 @@ test_tortls_x509_cert_get_id_digests(void *ignored) } #ifndef OPENSSL_OPAQUE -static int -fixed_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) -{ - (void) a; (void) b; - return 1; -} - static void fake_x509_free(X509 *cert) { @@ -569,70 +562,78 @@ fake_x509_free(X509 *cert) tor_free(cert); } } +#endif + +static tor_x509_cert_t *fixed_x509_cert = NULL; +static tor_x509_cert_t * +get_peer_cert_mock_return_fixed(tor_tls_t *tls) +{ + (void)tls; + if (fixed_x509_cert) + return tor_x509_cert_dup(fixed_x509_cert); + else + return NULL; +} static void test_tortls_cert_matches_key(void *ignored) { (void)ignored; - int res; - tor_tls_t *tls; - tor_x509_cert_t *cert; - X509 *one = NULL, *two = NULL; - EVP_PKEY_ASN1_METHOD *meth = EVP_PKEY_asn1_new(999, 0, NULL, NULL); - EVP_PKEY_asn1_set_public(meth, NULL, NULL, fixed_pub_cmp, NULL, NULL, NULL); - tls = tor_malloc_zero(sizeof(tor_tls_t)); - cert = tor_malloc_zero(sizeof(tor_x509_cert_t)); - one = tor_malloc_zero(sizeof(X509)); - one->references = 1; - two = tor_malloc_zero(sizeof(X509)); - two->references = 1; + X509 *cert1 = NULL, *cert2 = NULL, *cert3 = NULL, *cert4 = NULL; + tor_x509_cert_t *c1 = NULL, *c2 = NULL, *c3 = NULL, *c4 = NULL; + crypto_pk_t *k1 = NULL, *k2 = NULL, *k3 = NULL; - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 0); + k1 = pk_generate(1); + k2 = pk_generate(2); + k3 = pk_generate(3); - tls->ssl = tor_malloc_zero(sizeof(SSL)); - tls->ssl->session = tor_malloc_zero(sizeof(SSL_SESSION)); - tls->ssl->session->peer = one; - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 0); - - cert->cert = two; - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 0); - - one->cert_info = tor_malloc_zero(sizeof(X509_CINF)); - one->cert_info->key = tor_malloc_zero(sizeof(X509_PUBKEY)); - one->cert_info->key->pkey = tor_malloc_zero(sizeof(EVP_PKEY)); - one->cert_info->key->pkey->references = 1; - one->cert_info->key->pkey->ameth = meth; - one->cert_info->key->pkey->type = 1; - - two->cert_info = tor_malloc_zero(sizeof(X509_CINF)); - two->cert_info->key = tor_malloc_zero(sizeof(X509_PUBKEY)); - two->cert_info->key->pkey = tor_malloc_zero(sizeof(EVP_PKEY)); - two->cert_info->key->pkey->references = 1; - two->cert_info->key->pkey->ameth = meth; - two->cert_info->key->pkey->type = 2; - - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 0); - - one->cert_info->key->pkey->type = 1; - two->cert_info->key->pkey->type = 1; - res = tor_tls_cert_matches_key(tls, cert); - tt_int_op(res, OP_EQ, 1); + cert1 = tor_tls_create_certificate(k1, k2, "A", "B", 1000); + cert2 = tor_tls_create_certificate(k1, k3, "C", "D", 1000); + cert3 = tor_tls_create_certificate(k2, k3, "C", "D", 1000); + cert4 = tor_tls_create_certificate(k3, k2, "E", "F", 1000); + + tt_assert(cert1 && cert2 && cert3 && cert4); + + c1 = tor_x509_cert_new(cert1); cert1 = NULL; + c2 = tor_x509_cert_new(cert2); cert2 = NULL; + c3 = tor_x509_cert_new(cert3); cert3 = NULL; + c4 = tor_x509_cert_new(cert4); cert4 = NULL; + + tt_assert(c1 && c2 && c3 && c4); + + MOCK(tor_tls_get_peer_cert, get_peer_cert_mock_return_fixed); + + fixed_x509_cert = NULL; + /* If the peer has no certificate, it shouldn't match anything. */ + tt_assert(! tor_tls_cert_matches_key(NULL, c1)); + tt_assert(! tor_tls_cert_matches_key(NULL, c2)); + tt_assert(! tor_tls_cert_matches_key(NULL, c3)); + tt_assert(! tor_tls_cert_matches_key(NULL, c4)); + fixed_x509_cert = c1; + /* If the peer has a certificate, it should match every cert with the same + * subject key. */ + tt_assert(tor_tls_cert_matches_key(NULL, c1)); + tt_assert(tor_tls_cert_matches_key(NULL, c2)); + tt_assert(! tor_tls_cert_matches_key(NULL, c3)); + tt_assert(! tor_tls_cert_matches_key(NULL, c4)); done: - EVP_PKEY_asn1_free(meth); - tor_free(tls->ssl->session); - tor_free(tls->ssl); - tor_free(tls); - tor_free(cert); - fake_x509_free(one); - fake_x509_free(two); + tor_x509_cert_free(c1); + tor_x509_cert_free(c2); + tor_x509_cert_free(c3); + tor_x509_cert_free(c4); + if (cert1) X509_free(cert1); + if (cert2) X509_free(cert2); + if (cert3) X509_free(cert3); + if (cert4) X509_free(cert4); + crypto_pk_free(k1); + crypto_pk_free(k2); + crypto_pk_free(k3); + UNMOCK(tor_tls_get_peer_cert); } +#ifndef OPENSSL_OPAQUE static void test_tortls_cert_get_key(void *ignored) {

1 0

[webwml/master] Add emmapeel to the people page
by atagar＠torproject.org 21 Aug '18

21 Aug '18

commit fd21a1c40e17b191c43f016482a89627343d0fa2 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 21 16:18:12 2018 -0700 Add emmapeel to the people page --- about/en/corepeople.wml | 145 +++++++++++++++++++++------------------- images/people/emmapeel.png | Bin 0 -> 26223 bytes images/people/orig/emmapeel.png | Bin 0 -> 150954 bytes 3 files changed, 77 insertions(+), 68 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index dff21d00..edf98f99 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -208,6 +208,15 @@ <tr> <td> + <a id="emmapeel"></a> + <div class="photo"><img src="$(IMGROOT)/people/emmapeel.png" alt="emmapeel" /></div> + <div class="name"><a href="#emmapeel">emmapeel</a></div> + <div class="field"><b>IRC:</b> emmapeel</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> + <div class="description">emmapeel coordinates the localization (translations) of the different Tor software.</div> + </td> + + <td> <a id="ewyatt"></a> <div class="photo"><img src="$(IMGROOT)/people/ewyatt.png" alt="ewyatt" /></div> <div class="icon"><a href="../keys/ewyatt.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> @@ -215,7 +224,9 @@ <div class="field"><b>IRC:</b> ewyatt</div> <div class="description">Non-technical switchboard for people-related things: recruiting, onboarding, benefits, contracts, TPI policy questions, and baked goods.</div> </td> + </tr> + <tr> <td> <a id="biella"></a> <div class="photo"><img src="$(IMGROOT)/people/biella.png" alt="biella" /></div> @@ -225,9 +236,7 @@ <div class="field"><b>IRC:</b> biella</div> <div class="description"><a href="http://gabriellacoleman.org/">Anthropologist</a> and Wolfe Chair in Scientific and Technological Literacy at McGill University.</div> </td> - </tr> - <tr> <td> <a id="gman999"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -235,7 +244,9 @@ <div class="field"><b>IRC:</b> gman999</div> <div class="description">Tor BSD Diversity Project member, long-time relay operator, trainer.</div> </td> + </tr> + <tr> <td> <a id="GeKo"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -244,9 +255,7 @@ <div class="field"><b>IRC:</b> GeKo</div> <div class="description">Currently lead of the Tor Browser team.</div> </td> - </tr> - <tr> <td> <a id="asn"></a> <div class="photo"><img src="$(IMGROOT)/people/asn.png" alt="asn" /></div> @@ -255,7 +264,9 @@ <div class="field"><b>IRC:</b> asn</div> <div class="description">Onion services. Security analysis. Used to obfsproxy. Follower of the onion.</div> </td> + </tr> + <tr> <td> <a id="saint"></a> <div class="photo"><img src="$(IMGROOT)/people/saint.png" alt="saint" /></div> @@ -265,9 +276,7 @@ <div class="field"><b>IRC:</b> saint</div> <div class="description">Tamper-resistant software distribution, censorship detection, <a href="https://github.com/glamrock/cupcake">Cupcake</a>, and security training of activists and domestic violence survivors.</div> </td> - </tr> - <tr> <td> <a id="ggus"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -276,7 +285,9 @@ <div class="field"><b>IRC:</b> ggus</div> <div class="description">Works as Community Liaison in Global South. Trainer, relay operator and Tor advocate. CryptoRave organizer.</div> </td> + </tr> + <tr> <td> <a id="nyinz"></a> <div class="photo"><img src="$(IMGROOT)/people/nyinz.png" alt="nyinz" /></div> @@ -285,9 +296,7 @@ <div class="field"><b>IRC:</b> nyinz</div> <div class="description">I am very excited and honored to contribute to the Tor project on its mission to provide usable technologies to the global south.</div> </td> - </tr> - <tr> <td> <a id="irl"></a> <div class="photo"><img src="$(IMGROOT)/people/irl.png" alt="irl" /></div> @@ -298,7 +307,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://metrics.torproject.org">Metrics team member</a> and maintainer of <a href="https://metrics.torproject.org/rs.html">Relay Search</a>.</div> </td> + </tr> + <tr> <td> <a id="ian"></a> <div class="photo"><img src="$(IMGROOT)/people/ian.png" alt="ian" /></div> @@ -307,9 +318,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://cs.uwaterloo.ca/~iang/">Professor of CS</a> at the <a href="https://uwaterloo.ca/">University of Waterloo</a>, developing <a href="https://otr.cypherpunks.ca/">Off-the-Record Messaging</a> among other things.</div> </td> - </tr> - <tr> <td> <a id="igt0"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -319,7 +328,9 @@ <div class="field"><b>IRC:</b> igt0</div> <div class="description">Works on Tor Browser.</div> </td> + </tr> + <tr> <td> <a id="intrigeri"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -328,9 +339,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">He is one of our main interfaces with the <a href="https://tails.boum.org/">Tails</a> project.</div> </td> - </tr> - <tr> <td> <a id="isabela"></a> <div class="photo"><img src="$(IMGROOT)/people/isabela.png" alt="isabela" /></div> @@ -340,7 +349,9 @@ <div class="field"><b>IRC:</b> isabela</div> <div class="description">Coordinates Tor's development teams and roadmaps. Keeps track of priorities, and ensures Tor always thinks of the "user first".</div> </td> + </tr> + <tr> <td> <a id="ilv"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -348,9 +359,7 @@ <div class="name"><a href="#ilv">isra</a></div> <div class="description">Rewrote the <a href="https://gettor.torproject.org">GetTor</a> service.</div> </td> - </tr> - <tr> <td> <a id="iwakeh"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -358,7 +367,9 @@ <div class="name"><a href="#iwakeh">iwakeh</a></div> <div class="description">Speaks Java and other languages, streamlines build processes, and scrutinizes mathematical concepts behind aggregating tons of Tor network data.</div> </td> + </tr> + <tr> <td> <a id="redshiftzero"></a> <div class="photo"><img src="$(IMGROOT)/people/redshiftzero.png" alt="redshiftzero" /></div> @@ -368,9 +379,7 @@ <div class="field"><b>IRC:</b> redshiftzero</div> <div class="description">Lead developer of the <a href="https://securedrop.org/">SecureDrop</a> whistleblower platform based at the <a href="https://freedom.press/">Freedom of the Press Foundation</a>.</div> </td> - </tr> - <tr> <td> <a id="qbi"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -380,7 +389,9 @@ <div class="field"><b>IRC:</b> qbi</div> <div class="description">Volunteer that helped translate the website, is part of TorServers.net, and Tor's sysadmin team.</div> </td> + </tr> + <tr> <td> <a id="jselon"></a> <div class="photo"><img src="$(IMGROOT)/people/jselon.png" alt="jselon" /></div> @@ -389,9 +400,7 @@ <div class="field"><b>IRC:</b> jselon</div> <div class="description">Event Coordination, donor management, general office operations.</div> </td> - </tr> - <tr> <td> <a id="juga"></a> <div class="photo"><img src="$(IMGROOT)/people/juga.png" alt="juga" /></div> @@ -400,7 +409,9 @@ <div class="field"><b>IRC:</b> juga</div> <div class="description">Contributed to OONI, bug tracker features, wrote tordyguards. Currently working on bandwidth scanner.</div> </td> + </tr> + <tr> <td> <a id="julius"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -409,9 +420,7 @@ <div class="name"><a href="#julius">Julius Mittenzwei</a></div> <div class="description">Germany-based lawyer and Internet activist.</div> </td> - </tr> - <tr> <td> <a id="juris"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -420,7 +429,9 @@ <div class="field"><b>IRC:</b> juris</div> <div class="description">Board member of torservers.net.</div> </td> + </tr> + <tr> <td> <a id="karsten"></a> <div class="photo"><img src="$(IMGROOT)/people/karsten.png" alt="karsten" /></div> @@ -430,9 +441,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Primary researcher and developer into <a href="https://metrics.torproject.org/">anonymous metrics</a> which started as a National Science Foundation grant.</div> </td> - </tr> - <tr> <td> <a id="kat5"></a> <div class="photo"><img src="$(IMGROOT)/people/kat5.png" alt="kat5" /></div> @@ -442,7 +451,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Volunteer on the Community Team. Helps with t-shirts for relay operators and other odds and ends.</div> </td> + </tr> + <tr> <td> <a id="ailanthus"></a> <div class="photo"><img src="$(IMGROOT)/people/ailanthus.png" alt="ailanthus" /></div> @@ -452,9 +463,7 @@ <div class="field"><b>IRC:</b> ailanthus</div> <div class="description">Writes about Tor in mainstream and technical publications and conducts community workshops to teach people about Tor.</div> </td> - </tr> - <tr> <td> <a id="kushal"></a> <div class="photo"><img src="$(IMGROOT)/people/kushal.png" alt="kushal" /></div> @@ -465,16 +474,16 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://securedrop.org">SecureDrop</a> developer at the <a href="https://freedom.press">Freedom of Press Foundation</a>. Member of the community team, privacy advocate focusing on new users.</div> </td> + </tr> + <tr> <td> <a id="leif"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#leif">Leif Ryge</a></div> <div class="description">Works on security analysis, designer of "bananaphone" transport.</div> </td> - </tr> - <tr> <td> <a id="ln5"></a> <div class="photo"><img src="$(IMGROOT)/people/ln5.png" alt="ln5" /></div> @@ -483,7 +492,9 @@ <div class="field"><b>IRC:</b> ln5</div> <div class="description">Swedish advocate and Tor Board member. He works on implementing IPv6 in Tor, build automation, and runs a directory authority.</a></div> </td> + </tr> + <tr> <td> <a id="agrabeli"></a> <div class="photo"><img src="$(IMGROOT)/people/agrabeli.png" alt="agrabeli" /></div> @@ -494,9 +505,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Maria manages OONI's Partnership Program and writes research reports on internet censorship around the world.</div> </td> - </tr> - <tr> <td> <a id="mcs"></a> <div class="photo"><img src="$(IMGROOT)/people/mcs.png" alt="mcs" /></div> @@ -506,7 +515,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Developer on the Tor Browser team.</div> </td> + </tr> + <tr> <td> <a id="matt"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -514,9 +525,7 @@ <div class="name"><a href="#matt">Matt Blaze</a></div> <div class="description">Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity.</div> </td> - </tr> - <tr> <td> <a id="pastly"></a> <div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div> @@ -525,7 +534,9 @@ <div class="field"><b>IRC:</b> pastly</div> <div class="description">Matt <a href="http://mattttttssi4lhud.onion/">implemented</a> the <a href="http://www.robgjansen.com/publications/kist-sec2014.pdf">KIST scheduler</a> into Tor. He helps safely measure Tor and says helpful things on IRC.</div> </td> + </tr> + <tr> <td> <a id="sysrqb"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -535,9 +546,7 @@ <div class="field"><b>IRC:</b> sysrqb</div> <div class="description">Worked on tor, torsocks, and many other projects. Helped maintain and develop BridgeDB.</div> </td> - </tr> - <tr> <td> <a id="meejah"></a> <div class="photo"><img src="$(IMGROOT)/people/meejah.png" alt="meejah" /></div> @@ -547,7 +556,9 @@ <div class="field"><b>IRC:</b> meejah</div> <div class="description"><a href="https://meejah.ca">Author</a> of <a href="https://github.com/meejah/txtorcon">txtorcon</a>, <a href="https://github.com/meejah/carml">carml</a> and other Tor Python tools including some for bad-relay hunting.</div> </td> + </tr> + <tr> <td> <a id="micahflee"></a> <div class="photo"><img src="$(IMGROOT)/people/micahflee.png" alt="micahflee" /></div> @@ -556,9 +567,7 @@ <div class="name"><a href="#micahflee">Micah Lee</a></div> <div class="description">Developer of <a href="https://github.com/micahflee/onionshare">OnionShare</a> and <a href="https://github.com/micahflee/torbrowser-launcher">Tor Browser Launcher</a> journalist and security engineer at <a href="https://theintercept.com/staff/micah-lee/">The Intercept</a> and advocate for <a href="https://freedom.press/">freedom of the press</a>.</div> </td> - </tr> - <tr> <td> <a id="mtigas"></a> <div class="photo"><img src="$(IMGROOT)/people/mtigas.png" alt="mtigas" /></div> @@ -568,7 +577,9 @@ <div class="field"><b>IRC:</b> mtigas</div> <div class="description">Works on <a href="https://mike.tig.as/onionbrowser/">Onion Browser</a>, iOS, and hacker-journalist at <a href="https://www.propublica.org/">ProPublica</a> running their <a href="https://www.propub3r6espa33w.onion/">onion service</a>.</div> </td> + </tr> + <tr> <td> <a id="moritz"></a> <div class="photo"><img src="$(IMGROOT)/people/moritz.png" alt="moritz" /></div> @@ -577,9 +588,7 @@ <div class="name"><a href="#moritz">Moritz Bartl</a></div> <div class="description">Co-founder of <a href="https://www.torservers.net/">torservers.net</a>, a network of non-profit organizations that run Tor exit relays.</div> </td> - </tr> - <tr> <td> <a id="n8fr8"></a> <div class="photo"><img src="$(IMGROOT)/people/n8fr8.png" alt="n8fr8" /></div> @@ -588,7 +597,9 @@ <div class="field"><b>IRC:</b> n8fr8</div> <div class="description">Founder of the <a href="https://guardianproject.info/">Guardian Project</a>. Orbot lead developer and contributor to Orfox, Onion Browser and NetCipher SDK. Director of Technology at Tibet Action Institute.</div> </td> + </tr> + <tr> <td> <a id="nickhopper"></a> <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> @@ -597,9 +608,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div> </td> - </tr> - <tr> <td> <a id="nickm"></a> <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div> @@ -610,7 +619,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div> </td> + </tr> + <tr> <td> <a id="boklm"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -620,9 +631,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="mrphs"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -632,7 +641,9 @@ <div class="field"><b>IRC:</b> mrphs</div> <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div> </td> + </tr> + <tr> <td> <a id="pari"></a> <div class="photo"><img src="$(IMGROOT)/people/pari.png" alt="pari" /></div> @@ -642,9 +653,7 @@ <div class="field"><b>IRC:</b> pari</div> <div class="description">Works with UX and Community teams, and on Tor India initiatives. Started as an Outreachy intern.</div> </td> - </tr> - <tr> <td> <a id="syverson"></a> <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div> @@ -652,7 +661,9 @@ <div class="field"><b>IRC:</b> syverson</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div> </td> + </tr> + <tr> <td> <a id="pepijn"></a> <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div> @@ -661,16 +672,16 @@ <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div> <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div> </td> - </tr> - <tr> <td> <a id="peter"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#peter">Peter Palfrader</a></div> <div class="description">Manages the Debian packages, runs one of the directory authorities, and generally helps out a lot.</div> </td> + </tr> + <tr> <td> <a id="phw"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -680,9 +691,7 @@ <div class="field"><b>IRC:</b> phw</div> <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div> </td> - </tr> - <tr> <td> <a id="robt"></a> <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div> @@ -690,7 +699,9 @@ <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div> <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div> </td> + </tr> + <tr> <td> <a id="ramy"></a> <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div> @@ -699,9 +710,7 @@ <div class="name"><a href="#ramy">Ramy Raoof</a></div> <div class="description">Tor Board member, technologist, and privacy and security researcher.</div> </td> - </tr> - <tr> <td> <a id="pospeselr"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -711,7 +720,9 @@ <div class="field"><b>IRC:</b> pospeselr</div> <div class="description">Tor Browser developer.</div> </td> + </tr> + <tr> <td> <a id="robgjansen"></a> <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> @@ -721,9 +732,7 @@ <div class="field"><b>IRC:</b> robgjansen</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div> </td> - </tr> - <tr> <td> <a id="arma"></a> <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div> @@ -733,7 +742,9 @@ <div class="field"><b>IRC:</b> arma</div> <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div> </td> + </tr> + <tr> <td> <a id="sajolida"></a> <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div> @@ -742,9 +753,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Technical writing, UX, and fundraising for Tails.</div> </td> - </tr> - <tr> <td> <a id="sstevenson"></a> <div class="photo"><img src="$(IMGROOT)/people/sstevenson.png" alt="sstevenson" /></div> @@ -752,7 +761,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Directs and coordinates all fundraising activities.</div> </td> + </tr> + <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -760,9 +771,7 @@ <div class="name"><a href="#sebastian">Sebastian Hahn</a></div> <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div> </td> - </tr> - <tr> <td> <a id="sisbell"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -772,7 +781,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on Tor Browser for Android.</div> </td> + </tr> + <tr> <td> <a id="ssteele"></a> <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div> @@ -783,9 +794,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> - </tr> - <tr> <td> <a id="hiro"></a> <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div> @@ -795,7 +804,9 @@ <div class="field"><b>IRC:</b> hiro</div> <div class="description">Hiro builds and runs Tor Project's web applications and services.</div> </td> + </tr> + <tr> <td> <a id="inf0"></a> <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div> @@ -805,9 +816,7 @@ <div class="field"><b>IRC:</b> inf0</div> <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div> </td> - </tr> - <tr> <td> <a id="stephw"></a> <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div> @@ -818,7 +827,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Directs communications.</div> </td> + </tr> + <tr> <td> <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> @@ -828,9 +839,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href=""http://murdoch.is/"">Principal Research Fellow</a> at University College London. He is the original creator of the <a href=""https://www.torproject.org/projects/torbrowser.html.en"">Tor Browser</a>.</div> </td> - </tr> - <tr> <td> <a id="sukhe"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -839,7 +848,9 @@ <div class="field"><b>IRC:</b> sukhe</div> <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Member of the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div> </td> + </tr> + <tr> <td> <a id="haxxpop"></a> <div class="photo"><img src="$(IMGROOT)/people/haxxpop.png" alt="haxxpop" /></div> @@ -849,9 +860,7 @@ <div class="field"><b>IRC:</b> haxxpop</div> <div class="description">Contributes to core Tor and especially onion services.</div> </td> - </tr> - <tr> <td> <a id="catalyst"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -862,7 +871,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> + </tr> + <tr> <td> <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -872,9 +883,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Tor developer and chutney maintainer. Currently working on onion services, directory documents, and statistics.</div> </td> - </tr> - <tr> <td> <a id="tjr"></a> <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> @@ -885,7 +894,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> + </tr> + <tr> <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> @@ -895,9 +906,7 @@ <div class="field"><b>IRC:</b> t0mmy</div> <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div> </td> - </tr> - <tr> <td> <a id="egypcio"></a> <div class="photo"><img src="$(IMGROOT)/people/egypcio.png" alt="egypcio" /></div> @@ -907,7 +916,9 @@ <div class="field"><b>IRC:</b> egypcio</div> <div class="description">TorBSD Diversity Project (TDP); IPv6 Enthusiast, BSD Systems Evangelist, and Bridges/Relays Operator.</div> </td> + </tr> + <tr> <td> <a id="wseltzer"></a> <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div> @@ -918,9 +929,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div> </td> - </tr> - <tr> <td> <a id="yawning"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> diff --git a/images/people/emmapeel.png b/images/people/emmapeel.png new file mode 100644 index 00000000..b6cce062 Binary files /dev/null and b/images/people/emmapeel.png differ diff --git a/images/people/orig/emmapeel.png b/images/people/orig/emmapeel.png new file mode 100644 index 00000000..a192cac6 Binary files /dev/null and b/images/people/orig/emmapeel.png differ

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 21 Aug '18

21 Aug '18

commit 40514b701a13a6cbf1c08e6d98abf71cf630c826 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 21 22:45:03 2018 +0000 Update translations for abouttor-homepage --- pt_BR/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/aboutTor.dtd b/pt_BR/aboutTor.dtd index 97e5e0f80..80c6f8bc2 100644 --- a/pt_BR/aboutTor.dtd +++ b/pt_BR/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Sobre Tor"> <!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready2.label "Você está pronto para a maior experiência de navegação privada do mundo."> <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!"> <!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. ">

1 0

[policies/master] Add minutes for the 2018-06-20 meeting.
by linus＠torproject.org 21 Aug '18

21 Aug '18

commit 5a123e9a5c9ab3ce7260feadc186284899ebd759 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Aug 21 23:00:46 2018 +0200 Add minutes for the 2018-06-20 meeting. --- minutes/TPI_Board_Meeting_Minutes-2018-06-20.txt | 60 ++++++++++++++++++++++ ...ing_Minutes-2018-06-20.txt.1E8BF34923291265.asc | 16 ++++++ 2 files changed, 76 insertions(+) diff --git a/minutes/TPI_Board_Meeting_Minutes-2018-06-20.txt b/minutes/TPI_Board_Meeting_Minutes-2018-06-20.txt new file mode 100644 index 0000000..75582b0 --- /dev/null +++ b/minutes/TPI_Board_Meeting_Minutes-2018-06-20.txt @@ -0,0 +1,60 @@ +Tor Board Meeting Minutes for June 20, 2018 + +Phone/Video Meeting called to order at 16:00 UTC + +Present: Shari Steele, Matt Blaze, Ramy Raoof, Cindy Cohn, Linus +Nordberg, Biella Coleman, Nick Mathewson, Julius Mittenzwei, Megan +Price, and Roger Dingledine + +1. Administrivia + +– Approval of April 16, 2018 minutes. Matt moved the motion, Megan + seconded, all voted in favor. + +RESOLVED: minutes from April 16, 2018 approved. + +– Approval of March 12, 2018 minutes with amended time from 17:00 + UTC/16:00 Rome to 16:00UTC/ 17:00 Rome time. Biella moved the + motion, Matt seconded, all voted in favor. + +RESOLVED: minutes from March 12, 2018 approved. + +– Discussed potential dates for Mexico City Board meeting with current + proposal being: October 1st closed meeting and October 2nd in the + morning for the open meeting. + +2. Executive Director Transition Overview + +– Job descriptions for two project manager positions and fund raiser + have been drafted and circulated. + +3. Personnel Overview + +– Shari provided an overview of personnel status. + +4. Finances + +– Shari went over 2017-2018 financials and proposed budget 2018-2019. + +– Went over future/upcoming Tor Budget for July 1 2018 to June 30 + 2019. Biggest change is an increase in salaries/benefits and to + accommodate new hires. + +– Approval of 2018-2019 budget: Megan moved the motion, Cindy + seconded, all voted in favor. + +RESOLVED: 2018-2019 budget approved. + +5. New Board Members + +– Cindy will be proceeding to follow up for inviting potential + candidate to Mexico City. + +Ramy left at 13:30 + +6. Other Business + +– With feedback in place, Biella will be finishing finalization of + meetings minutes for release. + +Meeting Adjourned at 13:41 UTC diff --git a/minutes/TPI_Board_Meeting_Minutes-2018-06-20.txt.1E8BF34923291265.asc b/minutes/TPI_Board_Meeting_Minutes-2018-06-20.txt.1E8BF34923291265.asc new file mode 100644 index 0000000..dd39a2b --- /dev/null +++ b/minutes/TPI_Board_Meeting_Minutes-2018-06-20.txt.1E8BF34923291265.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEjEzVEQlemC6w77+iHovzSSMpEmUFAlt8fTUACgkQHovzSSMp +EmUHHA//e8mzR5UVqacap/X6PTvbq4EiLER/JQeF+w/2kuUh6WwWZtqniUGyOk/u +ztu+o2Q5CAziUZLT68/5DlULRrTHZyYJ4FH6680QymP/LzxRcVZEa3KpJgAlAhuT +Rr4e0QIrusFXdYuHP6zTjzRuw+Op5hYxGNHf/KcaB11fCp63kp1U4wQNyFqgbt37 +ahvIbcp8BJ1SBefQXw9fF0XJMzantctI3VsOQz4ApmiE+94lc9rbKtxyfKwmh9cO +CMno+mg4OX7fPyvylMyw0ULA9bV3gyXIoOxnKyt3E4f9wJMzHzEfcKjeODv436uM +gskvQmyflqTJtSCno30g872YU4GRXQuwivzfWyjsGw3CXrvGJ5XeaTjBp2vUl2U3 +kvjLqRzHTwrdPrrbNpxLuHzQKB79Bv7kGwLrHgz8JTWVbewjRq4ItgzboS32BJAv +EGmTsBc5mVGr5Sn70z93DFiyUXwyUx1yI1QqqfyG5e/de6z+W603+09XRGZl2Dav ++LAeH5MT+GvZePJEDe48DuS95Wt0+/SuejWymtNy/982fe6jUUUIIC8XPP3xDuv6 +Kq0nO1a3FdJ3CRHJ+tZCykq9EphwOSf/zm8bObsER3KToi4YMGxeGos2qkEAnTCc +htr6WoXYDiCecWDo7Pjod9iMs5TYNvVrazzbS0z1gbsakuBlw/4= +=O1O8 +-----END PGP SIGNATURE-----

1 0

[tor/master] Merge branch 'coverage_6aug_squashed'
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit 9bb0ac4bf107ca92bb62f419fd512f3d5989e70d Merge: 9bc947dc1 fe00a481f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 12:14:51 2018 -0400 Merge branch 'coverage_6aug_squashed' src/test/test_config.c | 67 ++++++++++++++++++++++++++++++ src/test/test_util.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+)

1 0

[tor/master] Add tests for the failing case of tor_localtime_r
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit f6763a8218d4fa7c377578b74154b7167f7c036d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 6 16:44:26 2018 -0400 Add tests for the failing case of tor_localtime_r --- src/test/test_util.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 888038bea..c3c0e6df3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -922,6 +922,32 @@ test_util_time(void *arg) teardown_capture_of_logs(); } } + { + /* As above, but with localtime. */ + t_res = -9223372036854775LL; + tor_localtime_r(&t_res, &b_time); + tt_assert(b_time.tm_year == (1970-1900) || + b_time.tm_year == (1-1900)); + + /* while unlikely, the system's gmtime(_r) could return + * a "correct" retrospective gregorian negative year value, + * which I'm pretty sure is: + * -1*(2^63)/60/60/24*2000/730485 + 1970 = -292277022657 + * 730485 is the number of days in two millennia, including leap days + * (int64_t)b_time.tm_year == (-292277022657LL-1900LL) without clamping */ + t_res = INT64_MIN; + CAPTURE(); + tor_localtime_r(&t_res, &b_time); + if (! (b_time.tm_year == (1970-1900) || + b_time.tm_year == (1-1900))) { + tt_int_op(b_time.tm_year, OP_EQ, 1970-1900); + } + if (b_time.tm_year != 1970-1900) { + CHECK_TIMEGM_WARNING("Rounding up to "); + } else { + teardown_capture_of_logs(); + } + } #endif /* SIZEOF_TIME_T == 8 */ /* time_t >= INT_MAX yields a year clamped to 2037 or 9999, @@ -938,6 +964,17 @@ test_util_time(void *arg) tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (2038-1900)); } + { + /* as above but with localtime. */ + t_res = 3*(1 << 29); + tor_localtime_r(&t_res, &b_time); + tt_assert(b_time.tm_year == (2021-1900)); + + t_res = INT32_MAX; + tor_localtime_r(&t_res, &b_time); + tt_assert(b_time.tm_year == (2037-1900) || + b_time.tm_year == (2038-1900)); + } #endif /* SIZEOF_TIME_T == 4 || SIZEOF_TIME_T == 8 */ #if SIZEOF_TIME_T == 8 @@ -963,6 +1000,27 @@ test_util_time(void *arg) tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (9999-1900)); } + { + /* As above but with localtime. */ + t_res = 9223372036854775LL; + tor_localtime_r(&t_res, &b_time); + tt_assert(b_time.tm_year == (2037-1900) || + b_time.tm_year == (9999-1900)); + + /* while unlikely, the system's gmtime(_r) could return + * a "correct" proleptic gregorian year value, + * which I'm pretty sure is: + * (2^63-1)/60/60/24*2000/730485 + 1970 = 292277026596 + * 730485 is the number of days in two millennia, including leap days + * (int64_t)b_time.tm_year == (292277026596L-1900L) without clamping */ + t_res = INT64_MAX; + CAPTURE(); + tor_localtime_r(&t_res, &b_time); + CHECK_TIMEGM_WARNING("Rounding down to "); + + tt_assert(b_time.tm_year == (2037-1900) || + b_time.tm_year == (9999-1900)); + } #endif /* SIZEOF_TIME_T == 8 */ /* Test {format,parse}_rfc1123_time */

1 0