September 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 88cf964ca3b117a427f3551e107cd86103e14464 Merge: 75d3c0821 ab74c3560 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:55:18 2019 -0400 Merge branch 'maint-0.4.1'

1 0

[tor/maint-0.4.1] Merge branch 'ticket31552_041' into maint-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit ab74c3560a423227fff337b1033716920920603b Merge: 0891a31ad fb0e8966f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:54:05 2019 -0400 Merge branch 'ticket31552_041' into maint-0.4.1 changes/bug31552 | 5 +++ src/feature/dirauth/keypin.h | 18 ++++++++- src/feature/dirauth/process_descs.h | 81 +++++++++++++++++++++++++++++++++++-- src/feature/dirauth/reachability.h | 31 ++++++++++++-- 4 files changed, 125 insertions(+), 10 deletions(-)

1 0

[tor/release-0.4.1] Stub out some more functions in dirvote/*.h, fix compilation.
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 4256ee0d379daf35098c396757ce92b97b025c6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 29 09:50:38 2019 -0400 Stub out some more functions in dirvote/*.h, fix compilation. This fixes LTO compilation for Android and -O0 compilation in general, when --disable-module-dirauth is provided. Fixes bug 31552; bugfix on 0.4.1.1-alpha. --- changes/bug31552 | 5 +++++ src/feature/dirauth/process_descs.h | 26 +++++++++++++++++++++++--- src/feature/dirauth/reachability.h | 16 ++++++++++++++-- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/changes/bug31552 b/changes/bug31552 new file mode 100644 index 000000000..fb33e1442 --- /dev/null +++ b/changes/bug31552 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + - Add more stub functions to fix compilation on Android with LTO, when + --disable-module-dirauth is used. Previously, these compilation + settings would make the compiler look for functions that didn't exist. + Fixes bug 31552; bugfix on 0.4.1.1-alpha. diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index 001c866eb..0da47c96c 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -25,15 +25,35 @@ enum was_router_added_t dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source); -int authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, - int complain, - int *valid_out); uint32_t dirserv_router_get_status(const routerinfo_t *router, const char **msg, int severity); void dirserv_set_node_flags_from_authoritative_status(node_t *node, uint32_t authstatus); +#ifdef HAVE_MODULE_DIRAUTH int dirserv_would_reject_router(const routerstatus_t *rs); +int authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, + int complain, + int *valid_out); +#else +static inline int +dirserv_would_reject_router(const routerstatus_t *rs) +{ + (void)rs; + return 0; +} +static inline int +authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, + int complain, + int *valid_out) +{ + (void)ri; + (void)msg; + (void)complain; + (void)valid_out; + return 0; +} +#endif #endif /* !defined(TOR_RECV_UPLOADS_H) */ diff --git a/src/feature/dirauth/reachability.h b/src/feature/dirauth/reachability.h index 873a3f9a2..0018c7f63 100644 --- a/src/feature/dirauth/reachability.h +++ b/src/feature/dirauth/reachability.h @@ -28,9 +28,21 @@ void dirserv_orconn_tls_done(const tor_addr_t *addr, uint16_t or_port, const char *digest_rcvd, const struct ed25519_public_key_t *ed_id_rcvd); -int dirserv_should_launch_reachability_test(const routerinfo_t *ri, - const routerinfo_t *ri_old); void dirserv_single_reachability_test(time_t now, routerinfo_t *router); void dirserv_test_reachability(time_t now); +#ifdef HAVE_MODULE_DIRAUTH +int dirserv_should_launch_reachability_test(const routerinfo_t *ri, + const routerinfo_t *ri_old); +#else +static inline int +dirserv_should_launch_reachability_test(const routerinfo_t *ri, + const routerinfo_t *ri_old) +{ + (void)ri; + (void)ri_old; + return 0; +} +#endif + #endif /* !defined(TOR_REACHABILITY_H) */

1 0

[tor/release-0.4.1] madvise: tolerate EINVAL and ENOSYS when minherit fails
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 0891a31ad32d0567fbc8f73a0598925cb543d699 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 09:13:50 2019 -0400 madvise: tolerate EINVAL and ENOSYS when minherit fails These errors can occur if we are built on a system with support for madvise(MADV_NOFORK) but then we are run on a system whose kernel does not support that flag. If the error is something that we don't tolerate at all, we now log it before crashing. Fixes bug 31696. I am calling this a bugfix on 0.4.1.1-alpha, where we actually started using the map_anon code. This is similar to, but not the same as, the fix for #31570. --- changes/bug31696 | 5 +++++ src/lib/malloc/map_anon.c | 24 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/changes/bug31696 b/changes/bug31696 new file mode 100644 index 000000000..b9d6c4130 --- /dev/null +++ b/changes/bug31696 @@ -0,0 +1,5 @@ + o Major bugfixes (crash, Linux): + - Tolerate systems (including some Linux installations) where madvise + and/or MADV_DONTFORK are available at build-time, but not at run time. + Previously, these systems would notice a failed syscall and abort. + Fixes bug 31696; bugfix on 0.4.1.1-alpha. diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index 0f6a4150c..08b754540 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -27,6 +27,9 @@ #include <windows.h> #endif +#include <string.h> +#include <errno.h> + /** * Macro to get the high bytes of a size_t, if there are high bytes. * Windows needs this; other operating systems define a size_t that does @@ -136,18 +139,33 @@ noinherit_mem(void *mem, size_t sz, inherit_res_t *inherit_result_out) return 0; } #endif /* defined(FLAG_ZERO) */ + #ifdef FLAG_NOINHERIT int r2 = MINHERIT(mem, sz, FLAG_NOINHERIT); if (r2 == 0) { *inherit_result_out = INHERIT_RES_DROP; + return 0; } - return r2; -#else /* !(defined(FLAG_NOINHERIT)) */ +#endif /* defined(FLAG_NOINHERIT) */ + +#if defined(FLAG_ZERO) || defined(FLAG_NOINHERIT) + /* At least one operation was tried, and neither succeeded. */ + + if (errno == ENOSYS || errno == EINVAL) { + /* Syscall not supported, or flag not supported. */ + return 0; + } else { + tor_log_err_sigsafe("Unexpected error from minherit: ", + strerror(errno), + NULL); + return -1; + } +#else (void)inherit_result_out; (void)mem; (void)sz; return 0; -#endif /* defined(FLAG_NOINHERIT) */ +#endif } /**

1 0

[tor/release-0.4.1] Stub more functions in dirvote headers to fix more of 31552.
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit fb0e8966f00c4349602594f312dae60cad2ea11d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 29 11:18:42 2019 -0400 Stub more functions in dirvote headers to fix more of 31552. --- src/feature/dirauth/keypin.h | 18 ++++++++-- src/feature/dirauth/process_descs.h | 69 ++++++++++++++++++++++++++++++++----- src/feature/dirauth/reachability.h | 19 +++++++--- 3 files changed, 92 insertions(+), 14 deletions(-) diff --git a/src/feature/dirauth/keypin.h b/src/feature/dirauth/keypin.h index 722b6ca5f..ab2362b3f 100644 --- a/src/feature/dirauth/keypin.h +++ b/src/feature/dirauth/keypin.h @@ -11,10 +11,25 @@ int keypin_check_and_add(const uint8_t *rsa_id_digest, const int replace_existing_entry); int keypin_check(const uint8_t *rsa_id_digest, const uint8_t *ed25519_id_key); +int keypin_close_journal(void); +#ifdef HAVE_MODULE_DIRAUTH int keypin_open_journal(const char *fname); -int keypin_close_journal(void); int keypin_load_journal(const char *fname); +#else +static inline int +keypin_open_journal(const char *fname) +{ + (void)fname; + return 0; +} +static inline int +keypin_load_journal(const char *fname) +{ + (void)fname; + return 0; +} +#endif void keypin_clear(void); int keypin_check_lone_rsa(const uint8_t *rsa_id_digest); @@ -44,4 +59,3 @@ MOCK_DECL(STATIC void, keypin_add_entry_to_map, (keypin_ent_t *ent)); #endif /* defined(KEYPIN_PRIVATE) */ #endif /* !defined(TOR_KEYPIN_H) */ - diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index 0da47c96c..a8a1dcca1 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -12,10 +12,13 @@ #ifndef TOR_RECV_UPLOADS_H #define TOR_RECV_UPLOADS_H -int dirserv_load_fingerprint_file(void); +// for was_router_added_t. +#include "feature/nodelist/routerlist.h" + void dirserv_free_fingerprint_list(void); -int dirserv_add_own_fingerprint(crypto_pk_t *pk); +#ifdef HAVE_MODULE_DIRAUTH +int dirserv_load_fingerprint_file(void); enum was_router_added_t dirserv_add_multiple_descriptors( const char *desc, size_t desclen, uint8_t purpose, @@ -25,19 +28,46 @@ enum was_router_added_t dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source); +int dirserv_would_reject_router(const routerstatus_t *rs); +int authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, + int complain, + int *valid_out); +int dirserv_add_own_fingerprint(crypto_pk_t *pk); uint32_t dirserv_router_get_status(const routerinfo_t *router, const char **msg, int severity); void dirserv_set_node_flags_from_authoritative_status(node_t *node, uint32_t authstatus); - -#ifdef HAVE_MODULE_DIRAUTH -int dirserv_would_reject_router(const routerstatus_t *rs); -int authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, - int complain, - int *valid_out); #else static inline int +dirserv_load_fingerprint_file(void) +{ + return 0; +} +static inline enum was_router_added_t +dirserv_add_multiple_descriptors(const char *desc, size_t desclen, + uint8_t purpose, + const char *source, + const char **msg) +{ + (void)desc; + (void)desclen; + (void)purpose; + (void)source; + (void)msg; + return (enum was_router_added_t)0; +} +static inline enum was_router_added_t +dirserv_add_descriptor(routerinfo_t *ri, + const char **msg, + const char *source) +{ + (void)ri; + (void)msg; + (void)source; + return (enum was_router_added_t)0; +} +static inline int dirserv_would_reject_router(const routerstatus_t *rs) { (void)rs; @@ -54,6 +84,29 @@ authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, (void)valid_out; return 0; } +static inline int +dirserv_add_own_fingerprint(crypto_pk_t *pk) +{ + (void)pk; + return 0; +} +static inline uint32_t +dirserv_router_get_status(const routerinfo_t *router, + const char **msg, + int severity) +{ + (void)router; + (void)msg; + (void)severity; + return 0; +} +static inline void +dirserv_set_node_flags_from_authoritative_status(node_t *node, + uint32_t authstatus) +{ + (void)node; + (void)authstatus; +} #endif #endif /* !defined(TOR_RECV_UPLOADS_H) */ diff --git a/src/feature/dirauth/reachability.h b/src/feature/dirauth/reachability.h index 0018c7f63..8a83f0c49 100644 --- a/src/feature/dirauth/reachability.h +++ b/src/feature/dirauth/reachability.h @@ -24,16 +24,16 @@ #define REACHABILITY_TEST_CYCLE_PERIOD \ (REACHABILITY_TEST_INTERVAL*REACHABILITY_MODULO_PER_TEST) -void dirserv_orconn_tls_done(const tor_addr_t *addr, - uint16_t or_port, - const char *digest_rcvd, - const struct ed25519_public_key_t *ed_id_rcvd); void dirserv_single_reachability_test(time_t now, routerinfo_t *router); void dirserv_test_reachability(time_t now); #ifdef HAVE_MODULE_DIRAUTH int dirserv_should_launch_reachability_test(const routerinfo_t *ri, const routerinfo_t *ri_old); +void dirserv_orconn_tls_done(const tor_addr_t *addr, + uint16_t or_port, + const char *digest_rcvd, + const struct ed25519_public_key_t *ed_id_rcvd); #else static inline int dirserv_should_launch_reachability_test(const routerinfo_t *ri, @@ -43,6 +43,17 @@ dirserv_should_launch_reachability_test(const routerinfo_t *ri, (void)ri_old; return 0; } +static inline void +dirserv_orconn_tls_done(const tor_addr_t *addr, + uint16_t or_port, + const char *digest_rcvd, + const struct ed25519_public_key_t *ed_id_rcvd) +{ + (void)addr; + (void)or_port; + (void)digest_rcvd; + (void)ed_id_rcvd; +} #endif #endif /* !defined(TOR_REACHABILITY_H) */

1 0

[tor/release-0.4.1] Merge branch 'ticket31552_041' into maint-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit ab74c3560a423227fff337b1033716920920603b Merge: 0891a31ad fb0e8966f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:54:05 2019 -0400 Merge branch 'ticket31552_041' into maint-0.4.1 changes/bug31552 | 5 +++ src/feature/dirauth/keypin.h | 18 ++++++++- src/feature/dirauth/process_descs.h | 81 +++++++++++++++++++++++++++++++++++-- src/feature/dirauth/reachability.h | 31 ++++++++++++-- 4 files changed, 125 insertions(+), 10 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit ece35992aca666cacbebf85686609fba923fb371 Merge: 6c3f339f0 ab74c3560 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:55:18 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31552 | 5 +++ changes/bug31696 | 5 +++ src/feature/dirauth/keypin.h | 18 ++++++++- src/feature/dirauth/process_descs.h | 81 +++++++++++++++++++++++++++++++++++-- src/feature/dirauth/reachability.h | 31 ++++++++++++-- src/lib/malloc/map_anon.c | 24 +++++++++-- 6 files changed, 151 insertions(+), 13 deletions(-)

1 0

[tor/maint-0.4.1] madvise: tolerate EINVAL and ENOSYS when minherit fails
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 0891a31ad32d0567fbc8f73a0598925cb543d699 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 09:13:50 2019 -0400 madvise: tolerate EINVAL and ENOSYS when minherit fails These errors can occur if we are built on a system with support for madvise(MADV_NOFORK) but then we are run on a system whose kernel does not support that flag. If the error is something that we don't tolerate at all, we now log it before crashing. Fixes bug 31696. I am calling this a bugfix on 0.4.1.1-alpha, where we actually started using the map_anon code. This is similar to, but not the same as, the fix for #31570. --- changes/bug31696 | 5 +++++ src/lib/malloc/map_anon.c | 24 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/changes/bug31696 b/changes/bug31696 new file mode 100644 index 000000000..b9d6c4130 --- /dev/null +++ b/changes/bug31696 @@ -0,0 +1,5 @@ + o Major bugfixes (crash, Linux): + - Tolerate systems (including some Linux installations) where madvise + and/or MADV_DONTFORK are available at build-time, but not at run time. + Previously, these systems would notice a failed syscall and abort. + Fixes bug 31696; bugfix on 0.4.1.1-alpha. diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index 0f6a4150c..08b754540 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -27,6 +27,9 @@ #include <windows.h> #endif +#include <string.h> +#include <errno.h> + /** * Macro to get the high bytes of a size_t, if there are high bytes. * Windows needs this; other operating systems define a size_t that does @@ -136,18 +139,33 @@ noinherit_mem(void *mem, size_t sz, inherit_res_t *inherit_result_out) return 0; } #endif /* defined(FLAG_ZERO) */ + #ifdef FLAG_NOINHERIT int r2 = MINHERIT(mem, sz, FLAG_NOINHERIT); if (r2 == 0) { *inherit_result_out = INHERIT_RES_DROP; + return 0; } - return r2; -#else /* !(defined(FLAG_NOINHERIT)) */ +#endif /* defined(FLAG_NOINHERIT) */ + +#if defined(FLAG_ZERO) || defined(FLAG_NOINHERIT) + /* At least one operation was tried, and neither succeeded. */ + + if (errno == ENOSYS || errno == EINVAL) { + /* Syscall not supported, or flag not supported. */ + return 0; + } else { + tor_log_err_sigsafe("Unexpected error from minherit: ", + strerror(errno), + NULL); + return -1; + } +#else (void)inherit_result_out; (void)mem; (void)sz; return 0; -#endif /* defined(FLAG_NOINHERIT) */ +#endif } /**

1 0

[community/develop] update user research section
by antonela＠torproject.org 17 Sep '19

17 Sep '19

commit 28b7768d5469f0b9e8471ba71fb291bc20c37f1a Author: Antonela <hola(a)antonela.me> Date: Tue Sep 17 16:12:03 2019 -0300 update user research section --- content/user-research/become-tester/contents.lr | 22 ++++++++++ content/user-research/contents.lr | 10 ++--- content/user-research/current/contents.lr | 19 --------- content/user-research/open/contents.lr | 54 +++++++++++++++++++++++++ content/user-research/signup/contents.lr | 19 --------- content/user-testing/current/contents.lr | 19 --------- content/user-testing/signup/contents.lr | 19 --------- databags/pagenav+en.ini | 4 ++ lego | 2 +- templates/user-research.html | 28 ++++++------- 10 files changed, 99 insertions(+), 97 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr new file mode 100644 index 0000000..248d815 --- /dev/null +++ b/content/user-research/become-tester/contents.lr @@ -0,0 +1,22 @@ +section: user research +--- +section_id: user-research +--- +color: primary +--- +image: eye +--- +_template: layout.html +--- +title: Become a tester +--- +subtitle: We regularly release Tor Browser Alpha versions to allow users to test software improvements and new ideas. +--- +key: 1 +--- +html: two-columns-page.html +--- +body: + +We regularly release Tor Browser Alpha versions to allow users to test software improvements and new ideas. +Sign up to be in our testing pool > diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 164efb8..844d79d 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -4,15 +4,13 @@ section_id: user-research --- color: primary --- -_hidden: yes ---- _template: layout.html --- title: User Research --- subtitle: We conduct user research while also respecting user privacy. --- -cta: In progress +cta: Learn about Tor users --- key: 4 --- @@ -20,6 +18,6 @@ html: user-research.html --- body: -Protecting privacy is what we do at Tor. -So how do we collect meaningful user feedback without violating user consent? -We conduct all of our user research through in-person studies that users explicitly opt into. +## We conduct user research while also respecting user privacy. + +We practice human-centered design on building tools for internet freedom while we build community. Our user research is funded by the premises of consent, respect, and empathy. Make an impact in your local community by listening to our users. Learn how we do it and help Tor with user research. diff --git a/content/user-research/current/contents.lr b/content/user-research/current/contents.lr deleted file mode 100644 index 1283e37..0000000 --- a/content/user-research/current/contents.lr +++ /dev/null @@ -1,19 +0,0 @@ -section: user research ---- -section_id: user-research ---- -color: primary ---- -image: clipboard ---- -_template: layout.html ---- -title: Currently Testing Stuffs ---- -subtitle: Link to somewhere we csan update more than this webpage, even banners will be tedious if we do testing all the time. We can even oput some thing puilled from there and have it populated here. ---- -key: 1 ---- -html: user-research.html ---- -body: diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr new file mode 100644 index 0000000..c0a9198 --- /dev/null +++ b/content/user-research/open/contents.lr @@ -0,0 +1,54 @@ +section: user research +--- +section_id: user-research +--- +color: primary +--- +image: eye +--- +_template: layout.html +--- +title: Open user research +--- +subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community. +--- +key: 2 +--- +html: two-columns-page.html +--- +body: + +In this page you find the current needs to be run when testing Tor products, as well as methodologies and testing scripts. Before running a Tor user research, be sure you read our [Guidelines to be a User Researcher with Tor]. + +Tor Browser for Desktop +* [Usability Testing: Onboarding](https://link) +* [Usability Testing: Security Settings](https://link) +* [Usability Testing: New Identity](https://link) +* [Usability Testing: Warnings and Notifications](https://link) +* [Usability Testing: Circuit Display](https://link) + +Tor Browser for Android +* [Usability Testing: Onboarding](https://link) +* [Usability Testing: Security Settings](https://link) +* [Usability Testing: New Identity](https://link) +* [Usability Testing: Warnings and Notifications](https://link) + +### Onion Services +* [Usability Testing: Onion Security Indicator](https://trac.torproject.org/projects/tor/attachment/wiki/org/tea… +* [Usability Methodology: Onion Security Indicator](https://trac.torproject.org/projects/tor/attachment/wiki/org/tea… + +### Circuit Display +* [Usability Testing: Circuit Display](https://trac.torproject.org/projects/tor/attachment/wiki/org/teams… +* [Usability Methodology: Circuit Display](https://trac.torproject.org/projects/tor/attachment/wiki/org/teams… + +## Past User Research +On our commitment with an open design, we make public here our user research ran through the global-south. If you want to run user research with us, please [get in touch.](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux) + +| Project | Methodology | Locations | Dates | Reporting | +| -------- | ----------- | --------- | --------- | ----- | +| Tor Launcher | Usability testing (.pdf) | Mumbai(IN) | Q118 | .pdf | +| Onion Security Indicator | Usability testing (.pdf) | Mumbai(IN), Kampala(UG), Valencia(ES), Mombasa(KE)| Q118, Q218 | .pdf | +| TB Circuit Display | Usability testing (.pdf) | Kampala(UG), Nairobi(KE), Mombasa(KE) | Q118, Q218 | .pdf | +| Tor Browser for Desktop | User needs discovery (.pdf) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE) | 2018 | .pdf | +| Tor Browser for Android | User needs discovery (.pdf) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE) | 2018 | .pdf | +| Tor Users Demographics | Survey (link) | Online | 2018 | .pdf | diff --git a/content/user-research/signup/contents.lr b/content/user-research/signup/contents.lr deleted file mode 100644 index 06cd047..0000000 --- a/content/user-research/signup/contents.lr +++ /dev/null @@ -1,19 +0,0 @@ -section: user research ---- -section_id: user-research ---- -color: primary ---- -image: eye ---- -_template: layout.html ---- -title: Sign up to be in our testing pool ---- -subtitle: Will you help us by becoming a Tor tester? Sign up for the user testing mailing list and we'll email you when there's a new test. We will never use your email for any other purposes. ---- -key: 2 ---- -html: user-research.html ---- -body: diff --git a/content/user-testing/current/contents.lr b/content/user-testing/current/contents.lr deleted file mode 100644 index 1d10937..0000000 --- a/content/user-testing/current/contents.lr +++ /dev/null @@ -1,19 +0,0 @@ -section: user testing ---- -section_id: user-testing ---- -color: primary ---- -image: clipboard ---- -_template: layout.html ---- -title: Currently Testing Stuffs ---- -subtitle: Link to somewhere we csan update more than this webpage, even banners will be tedious if we do testing all the time. We can even oput some thing puilled from there and have it populated here. ---- -key: 1 ---- -html: user-testing.html ---- -body: diff --git a/content/user-testing/signup/contents.lr b/content/user-testing/signup/contents.lr deleted file mode 100644 index e238096..0000000 --- a/content/user-testing/signup/contents.lr +++ /dev/null @@ -1,19 +0,0 @@ -section: user testing ---- -section_id: user-testing ---- -color: primary ---- -image: eye ---- -_template: layout.html ---- -title: Sign up to be in our testing pool ---- -subtitle: Will you help us by becoming a Tor tester? Sign up for the user testing mailing list and we'll email you when there's a new test. We will never use your email for any other purposes. ---- -key: 2 ---- -html: user-testing.html ---- -body: diff --git a/databags/pagenav+en.ini b/databags/pagenav+en.ini index cb5b415..2dd844a 100644 --- a/databags/pagenav+en.ini +++ b/databags/pagenav+en.ini @@ -10,6 +10,10 @@ label = Localization path = outreach label = Outreach +[user-research] +path = user-research +label = User Research + [relay-operations] path = relay-operations label = Relay Operations diff --git a/lego b/lego index 9c33e2b..8cb5f20 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 9c33e2b8740728dc9de4c64915460b76fc7c4061 +Subproject commit 8cb5f20089a163b0a5134d841248778cb518bdf2 diff --git a/templates/user-research.html b/templates/user-research.html index 3c3ac7b..e12fa62 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -7,28 +7,28 @@ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> - <h2 class="text-primary"><u>{{ _('Want to know more? Take a look at our process') }} - <i class="fas fa-arrow-right"></i></u> - </h2> - <div class="row py-5"> + <div class="row"> {% for child in this.children|sort(attribute='key') %} - <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> - <div class="card h-100 border-0"> + <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> + <div class="card h-100"> <div class="card-body"> - <span class="text-primary h3"><i class="far fa-{{ child.image }}"></i></span> - <h4 class="card-title text-primary my-3">{{ child.title }}</h4> - <p class="card-text">{{ child.subtitle }}</p> + <div class="card-body"> + <h4 class="card-title text-primary"> + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + </h4> + <p class="card-text">{{ _(child.subtitle) }}</p> + </div> </div> </div> </div> {% endfor %} </div> <div class="row py-5 text-center mx-auto"> - <h2 class="display-4 text-primary text-center mx-auto">{{ _('Be a user testing coordinator') }}</h2> + <h2 class="display-4 text-primary text-center mx-auto">{{ _('Become a Community User Researcher') }}</h2> <p class="text-center"> - {{ _('Are you a UX researcher interested in running Tor user tests? Have new ideas, suggestions, or studies that can help improve Tor applications? Help us by coordinating user testing, and we\'ll send you a Tor t-shirt.') }}</p> - <h3 class="text-primary text-center mx-auto"><u>{{ _('User research list') }} - <i class="fas fa-arrow-right"></i></u> - </h3> + {{ _('Are you a design researcher, user researcher, student, or someone interested in learning more about Tor users? Do you have new ideas, suggestions, or research that can help improve Tor applications? Help us by coordinating user research with your local community, and learn more about best practices for working with users at-risk.') }}</p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/ux"> + {{ _('UX team mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> </div> </div>

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 17 Sep '19

17 Sep '19

commit 0f0a011566ee5742d1d0604005c8e900be804281 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 18:52:34 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 6c9a32537..bc4adf203 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -761,7 +761,7 @@ msgstr "" #: templates/contact.html:100 msgid "Email us" -msgstr "" +msgstr "メール" #: templates/contact.html:101 msgid "" @@ -773,7 +773,7 @@ msgstr "" #: templates/contact.html:107 msgid "Send us Mail" -msgstr "" +msgstr "郵便" #: templates/download-android.html:12 msgid "Get Tor Browser for Android."

1 0