tor-commits July 2020

tor-commits@lists.torproject.org

17 participants
2100 discussions

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/59'
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit d6570eaf5d8690799a1b698552315372fae2e1f0 Merge: b18e274919 29307c0625 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 20 16:37:11 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/59' changes/feature40047 | 6 ++ scripts/maint/practracker/exceptions.txt | 8 +-- src/app/config/config.c | 7 +++ src/app/main/main.c | 9 ++- src/lib/osinfo/include.am | 6 +- src/lib/osinfo/libc.c | 66 ++++++++++++++++++++++ src/lib/osinfo/libc.h | 19 +++++++ .../conf_examples/crypto_accel/expected_log_nss | 2 +- .../crypto_accel_req/expected_log_nss | 2 +- src/test/conf_examples/lzma_zstd_1/expected_log | 2 +- .../conf_examples/lzma_zstd_1/expected_log_lzma | 2 +- .../lzma_zstd_1/expected_log_lzma_zstd | 2 +- .../conf_examples/lzma_zstd_1/expected_log_zstd | 2 +- src/test/conf_examples/nss_1/expected_log | 2 +- src/test/conf_examples/nss_1/expected_log_nss | 2 +- src/test/test_parseconf.sh | 2 +- 16 files changed, 122 insertions(+), 17 deletions(-)

1 0

[tor/master] Add running glibc version to the log. #40047
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit 29307c0625fd6a95080d341b15646a4cd55b4178 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Fri Jul 17 18:22:51 2020 +0100 Add running glibc version to the log. #40047 Also adds the compiled and running glibc version when using the --library-versions flag. --- changes/feature40047 | 6 ++ scripts/maint/practracker/exceptions.txt | 8 +-- src/app/config/config.c | 7 +++ src/app/main/main.c | 9 ++- src/lib/osinfo/include.am | 6 +- src/lib/osinfo/libc.c | 66 ++++++++++++++++++++++ src/lib/osinfo/libc.h | 19 +++++++ .../conf_examples/crypto_accel/expected_log_nss | 2 +- .../crypto_accel_req/expected_log_nss | 2 +- src/test/conf_examples/lzma_zstd_1/expected_log | 2 +- .../conf_examples/lzma_zstd_1/expected_log_lzma | 2 +- .../lzma_zstd_1/expected_log_lzma_zstd | 2 +- .../conf_examples/lzma_zstd_1/expected_log_zstd | 2 +- src/test/conf_examples/nss_1/expected_log | 2 +- src/test/conf_examples/nss_1/expected_log_nss | 2 +- src/test/test_parseconf.sh | 2 +- 16 files changed, 122 insertions(+), 17 deletions(-) diff --git a/changes/feature40047 b/changes/feature40047 new file mode 100644 index 0000000000..ff313a9fa5 --- /dev/null +++ b/changes/feature40047 @@ -0,0 +1,6 @@ + o Minor features (logging): + - Adds the running glibc version to the log. Also adds the + running and compiled glibc version to the library list + returned when using the flag --library-versions. Patch + from Daniel Pinto. Closes ticket 40047; bugfix on + 0.4.5.0-alpha-dev. diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 87581b6c8c..b2a34b808a 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -34,10 +34,10 @@ # Remember: It is better to fix the problem than to add a new exception! problem file-size /src/app/config/config.c 7525 -problem include-count /src/app/config/config.c 80 +problem include-count /src/app/config/config.c 81 problem function-size /src/app/config/config.c:options_act() 381 problem function-size /src/app/config/config.c:options_validate_cb() 794 -problem function-size /src/app/config/config.c:options_init_from_torrc() 192 +problem function-size /src/app/config/config.c:options_init_from_torrc() 198 problem function-size /src/app/config/config.c:options_init_from_string() 103 problem function-size /src/app/config/config.c:options_init_logs() 125 problem function-size /src/app/config/config.c:parse_bridge_line() 104 @@ -48,9 +48,9 @@ problem function-size /src/app/config/config.c:port_parse_config() 435 problem function-size /src/app/config/config.c:parse_ports() 132 problem function-size /src/app/config/resolve_addr.c:resolve_my_address_v4() 197 problem file-size /src/app/config/or_options_st.h 1050 -problem include-count /src/app/main/main.c 68 +problem include-count /src/app/main/main.c 71 problem function-size /src/app/main/main.c:dumpstats() 102 -problem function-size /src/app/main/main.c:tor_init() 101 +problem function-size /src/app/main/main.c:tor_init() 109 problem function-size /src/app/main/main.c:sandbox_init_filter() 291 problem function-size /src/app/main/main.c:run_tor_main_loop() 105 problem function-size /src/app/main/ntmain.c:nt_service_install() 126 diff --git a/src/app/config/config.c b/src/app/config/config.c index f4172bd84e..0b5ec0c977 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -140,6 +140,7 @@ #include "lib/meminfo/meminfo.h" #include "lib/osinfo/uname.h" +#include "lib/osinfo/libc.h" #include "lib/process/daemon.h" #include "lib/process/pidfile.h" #include "lib/process/restrict.h" @@ -4365,6 +4366,12 @@ options_init_from_torrc(int argc, char **argv) tor_compress_version_str(ZSTD_METHOD), tor_compress_header_version_str(ZSTD_METHOD)); } + if (tor_libc_get_name()) { + printf("%-7s \t\t%-15s\t\t%s\n", + tor_libc_get_name(), + tor_libc_get_header_version_str(), + tor_libc_get_version_str()); + } //TODO: Hex versions? return 1; } diff --git a/src/app/main/main.c b/src/app/main/main.c index 4b1308ddf0..582978bc81 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -67,6 +67,7 @@ #include "lib/meminfo/meminfo.h" #include "lib/osinfo/uname.h" +#include "lib/osinfo/libc.h" #include "lib/sandbox/sandbox.h" #include "lib/fs/lockfile.h" #include "lib/tls/tortls.h" @@ -578,7 +579,8 @@ tor_init(int argc, char *argv[]) const char *version = get_version(); log_notice(LD_GENERAL, "Tor %s running on %s with Libevent %s, " - "%s %s, Zlib %s, Liblzma %s, and Libzstd %s.", version, + "%s %s, Zlib %s, Liblzma %s, Libzstd %s and %s %s as libc.", + version, get_uname(), tor_libevent_get_version_str(), crypto_get_library_name(), @@ -588,7 +590,10 @@ tor_init(int argc, char *argv[]) tor_compress_supports_method(LZMA_METHOD) ? tor_compress_version_str(LZMA_METHOD) : "N/A", tor_compress_supports_method(ZSTD_METHOD) ? - tor_compress_version_str(ZSTD_METHOD) : "N/A"); + tor_compress_version_str(ZSTD_METHOD) : "N/A", + tor_libc_get_name() ? + tor_libc_get_name() : "Unknown", + tor_libc_get_version_str()); log_notice(LD_GENERAL, "Tor can't help you if you use it wrong! " "Learn how to be safe at " diff --git a/src/lib/osinfo/include.am b/src/lib/osinfo/include.am index 84bd7feb00..df8c98500c 100644 --- a/src/lib/osinfo/include.am +++ b/src/lib/osinfo/include.am @@ -7,7 +7,8 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_osinfo_a_SOURCES = \ - src/lib/osinfo/uname.c + src/lib/osinfo/uname.c \ + src/lib/osinfo/libc.c src_lib_libtor_osinfo_testing_a_SOURCES = \ $(src_lib_libtor_osinfo_a_SOURCES) @@ -16,4 +17,5 @@ src_lib_libtor_osinfo_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ - src/lib/osinfo/uname.h + src/lib/osinfo/uname.h \ + src/lib/osinfo/libc.h diff --git a/src/lib/osinfo/libc.c b/src/lib/osinfo/libc.c new file mode 100644 index 0000000000..32cbad0fa2 --- /dev/null +++ b/src/lib/osinfo/libc.c @@ -0,0 +1,66 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file libc.c + * @brief Functions to get the name and version of the system libc. + **/ + +#include "orconfig.h" +#include "lib/osinfo/libc.h" +#include <stdlib.h> + +#ifdef HAVE_GNU_LIBC_VERSION_H +#include <gnu/libc-version.h> +#endif + +#ifdef HAVE_GNU_LIBC_VERSION_H +#ifdef HAVE_GNU_GET_LIBC_VERSION +#define CHECK_LIBC_VERSION +#endif +#endif + +#define STR_IMPL(x) #x +#define STR(x) STR_IMPL(x) + +/** Return the name of the compile time libc. Returns NULL if we + * cannot identify the libc. */ +const char * +tor_libc_get_name(void) +{ +#ifdef __GLIBC__ + return "Glibc"; +#else /* !defined(__GLIBC__) */ + return NULL; +#endif /* defined(__GLIBC__) */ +} + +/** Return a string representation of the version of the currently running + * version of Glibc. */ +const char * +tor_libc_get_version_str(void) +{ +#ifdef CHECK_LIBC_VERSION + const char *version = gnu_get_libc_version(); + if (version == NULL) + return "N/A"; + return version; +#else /* !defined(CHECK_LIBC_VERSION) */ + return "N/A"; +#endif /* defined(CHECK_LIBC_VERSION) */ +} + +/** Return a string representation of the version of Glibc that was used at + * compilation time. */ +const char * +tor_libc_get_header_version_str(void) +{ +#ifdef __GLIBC__ + return STR(__GLIBC__) "." STR(__GLIBC_MINOR__); +#else + return "N/A"; +#endif /* defined(__GLIBC__) */ +} diff --git a/src/lib/osinfo/libc.h b/src/lib/osinfo/libc.h new file mode 100644 index 0000000000..f4303f8c9c --- /dev/null +++ b/src/lib/osinfo/libc.h @@ -0,0 +1,19 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file libc.h + * @brief Header for lib/osinfo/libc.c + **/ + +#ifndef TOR_LIB_OSINFO_LIBC_H +#define TOR_LIB_OSINFO_LIBC_H + +const char *tor_libc_get_name(void); +const char *tor_libc_get_version_str(void); +const char *tor_libc_get_header_version_str(void); + +#endif /* !defined(TOR_LIB_OSINFO_LIBC_H) */ diff --git a/src/test/conf_examples/crypto_accel/expected_log_nss b/src/test/conf_examples/crypto_accel/expected_log_nss index c0fe7b003c..bcbfa2cf6b 100644 --- a/src/test/conf_examples/crypto_accel/expected_log_nss +++ b/src/test/conf_examples/crypto_accel/expected_log_nss @@ -1 +1 @@ -Tor 0.* running on .* with Libevent .*, NSS .*, Zlib .*, Liblzma .*, and Libzstd .* +Tor 0.* running on .* with Libevent .*, NSS .*, Zlib .*, Liblzma .*, Libzstd .* and .* .* as libc diff --git a/src/test/conf_examples/crypto_accel_req/expected_log_nss b/src/test/conf_examples/crypto_accel_req/expected_log_nss index c0fe7b003c..bcbfa2cf6b 100644 --- a/src/test/conf_examples/crypto_accel_req/expected_log_nss +++ b/src/test/conf_examples/crypto_accel_req/expected_log_nss @@ -1 +1 @@ -Tor 0.* running on .* with Libevent .*, NSS .*, Zlib .*, Liblzma .*, and Libzstd .* +Tor 0.* running on .* with Libevent .*, NSS .*, Zlib .*, Liblzma .*, Libzstd .* and .* .* as libc diff --git a/src/test/conf_examples/lzma_zstd_1/expected_log b/src/test/conf_examples/lzma_zstd_1/expected_log index a5531ca21e..f143b23102 100644 --- a/src/test/conf_examples/lzma_zstd_1/expected_log +++ b/src/test/conf_examples/lzma_zstd_1/expected_log @@ -1 +1 @@ -Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma N/A, and Libzstd N/A +Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma N/A, Libzstd N/A and .* .* as libc diff --git a/src/test/conf_examples/lzma_zstd_1/expected_log_lzma b/src/test/conf_examples/lzma_zstd_1/expected_log_lzma index 2947e5991b..abb4731abc 100644 --- a/src/test/conf_examples/lzma_zstd_1/expected_log_lzma +++ b/src/test/conf_examples/lzma_zstd_1/expected_log_lzma @@ -1 +1 @@ -Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma .*, and Libzstd N/A +Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma .*, Libzstd N/A and .* .* as libc diff --git a/src/test/conf_examples/lzma_zstd_1/expected_log_lzma_zstd b/src/test/conf_examples/lzma_zstd_1/expected_log_lzma_zstd index e76e4357f8..b4e45772dd 100644 --- a/src/test/conf_examples/lzma_zstd_1/expected_log_lzma_zstd +++ b/src/test/conf_examples/lzma_zstd_1/expected_log_lzma_zstd @@ -1 +1 @@ -Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma .*, and Libzstd .* \ No newline at end of file +Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma .*, Libzstd .* and .* .* as libc \ No newline at end of file diff --git a/src/test/conf_examples/lzma_zstd_1/expected_log_zstd b/src/test/conf_examples/lzma_zstd_1/expected_log_zstd index c8b174423b..994b46974b 100644 --- a/src/test/conf_examples/lzma_zstd_1/expected_log_zstd +++ b/src/test/conf_examples/lzma_zstd_1/expected_log_zstd @@ -1 +1 @@ -Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma N/A, and Libzstd .* \ No newline at end of file +Tor 0.* running on .* with Libevent .*, .*, Zlib .*, Liblzma N/A, Libzstd .* and .* .* as libc \ No newline at end of file diff --git a/src/test/conf_examples/nss_1/expected_log b/src/test/conf_examples/nss_1/expected_log index 32e8cfc2f8..38f1febda5 100644 --- a/src/test/conf_examples/nss_1/expected_log +++ b/src/test/conf_examples/nss_1/expected_log @@ -1 +1 @@ -Tor 0.* running on .* with Libevent .*, OpenSSL .*, Zlib .*, Liblzma .*, and Libzstd .* +Tor 0.* running on .* with Libevent .*, OpenSSL .*, Zlib .*, Liblzma .*, Libzstd .* and .* .* as libc diff --git a/src/test/conf_examples/nss_1/expected_log_nss b/src/test/conf_examples/nss_1/expected_log_nss index c0fe7b003c..bcbfa2cf6b 100644 --- a/src/test/conf_examples/nss_1/expected_log_nss +++ b/src/test/conf_examples/nss_1/expected_log_nss @@ -1 +1 @@ -Tor 0.* running on .* with Libevent .*, NSS .*, Zlib .*, Liblzma .*, and Libzstd .* +Tor 0.* running on .* with Libevent .*, NSS .*, Zlib .*, Liblzma .*, Libzstd .* and .* .* as libc diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh index 4fe27d9f5d..c02b8b23c0 100755 --- a/src/test/test_parseconf.sh +++ b/src/test/test_parseconf.sh @@ -202,7 +202,7 @@ STANDARD_LIBS="libevent\\|openssl\\|zlib" # shellcheck disable=SC2018,SC2019 TOR_LIBS_ENABLED="$("$TOR_BINARY" --verify-config \ -f "$EMPTY" --defaults-torrc "$EMPTY" \ - | sed -n 's/.* Tor .* running on .* with$.*$\./\1/p' \ + | sed -n 's/.* Tor .* running on .* with$.*$ and .* .* as libc\./\1/p' \ | tr 'A-Z' 'a-z' | tr ',' '\n' \ | grep -v "$STANDARD_LIBS" | grep -v "n/a" \ | sed 's/$ and$* $lib$*$[a-z0-9]*$ .*/\3/' \

1 0

[tpo/staging] Merge branch 'master' into 'master'
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 45325bd07147bafbcbbd4dba662f544a53aef25c Merge: 8b6151b5 f4bad6a2 Author: Antonela <antonela(a)torproject.org> Date: Mon Jul 20 13:35:14 2020 +0000 Merge branch 'master' into 'master' Master See merge request antonela/tpo!1 .github/FUNDING.yml | 3 + .htaccess | 17 +- README.md | 63 + assets/javascript | 2 +- assets/scss | 2 +- assets/static/css | 2 +- assets/static/fonts | 2 +- assets/static/images/circle-pattern.png | Bin 556240 -> 106272 bytes assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes assets/static/images/favicon/favicon.ico | Bin 0 -> 4286 bytes assets/static/images/favicon/favicon.png | Bin 0 -> 1184 bytes assets/static/images/home/png/take-back(a)3x.png | Bin 0 -> 124543 bytes assets/static/images/home/svg/take-back.svg | 7902 ++++++++++++++++++++ assets/static/images/people/acute.png | Bin 0 -> 43888 bytes assets/static/images/people/ailanthus.png | Bin 40198 -> 0 bytes assets/static/images/people/dennisjackson.png | Bin 0 -> 45557 bytes assets/static/images/people/ggus.png | Bin 0 -> 21509 bytes assets/static/images/people/isabela.png | Bin 46938 -> 834334 bytes assets/static/images/people/jnewsome.png | Bin 0 -> 79184 bytes assets/static/images/people/narrira.png | Bin 0 -> 45902 bytes assets/static/images/people/orig/acute.jpg | Bin 0 -> 33472 bytes assets/static/images/people/orig/wshackleton.png | Bin 0 -> 239868 bytes assets/static/images/people/wshackleton.png | Bin 0 -> 29922 bytes assets/static/images/privchat/carmela.png | Bin 0 -> 274355 bytes assets/static/images/privchat/dkg.png | Bin 0 -> 230884 bytes assets/static/images/privchat/matt.png | Bin 0 -> 199735 bytes assets/static/images/privchat/pattern.png | Bin 0 -> 325952 bytes assets/static/images/privchat/privchat.png | Bin 0 -> 19090 bytes assets/static/images/privchat/privchat.svg | 11 + assets/static/images/privchat/roger.png | Bin 0 -> 192986 bytes .../sponsors/Georgetown_logotype_S_blueRGB.png | Bin 0 -> 31850 bytes assets/static/images/sponsors/Mullvad_logo.png | Bin 0 -> 45792 bytes assets/static/images/sponsors/RIPE_NCC_logo.png | Bin 0 -> 49160 bytes .../sponsors/craig-newmark-philanthropies.png | Bin 0 -> 28397 bytes assets/static/images/sponsors/dial.png | Bin 0 -> 26001 bytes assets/static/images/sponsors/gsoc.png | Bin 0 -> 33641 bytes assets/static/images/sponsors/zcash_logo.png | Bin 0 -> 48816 bytes assets/static/images/tb95/onion-auth.png | Bin 0 -> 52389 bytes assets/static/images/tb95/onion-auth2.png | Bin 0 -> 79194 bytes assets/static/images/tb95/onion-auth2(a)2x.png | Bin 0 -> 270354 bytes assets/static/images/tb95/onion-auth(a)2x.png | Bin 0 -> 192867 bytes assets/static/images/tb95/onion-error.png | Bin 0 -> 86735 bytes assets/static/images/tb95/onion-error(a)2x.png | Bin 0 -> 305169 bytes .../images/tb95/onion-location-propublica.png | Bin 0 -> 195783 bytes .../images/tb95/onion-location-propublica2.png | Bin 0 -> 84147 bytes .../images/tb95/onion-location-propublica2(a)2x.png | Bin 0 -> 295176 bytes .../images/tb95/onion-location-propublica(a)2x.png | Bin 0 -> 659848 bytes .../static/images/tb95/onion-location-riseup.png | Bin 0 -> 152691 bytes .../images/tb95/onion-location-riseup(a)2x.png | Bin 0 -> 471532 bytes assets/static/images/tb95/onion-names.png | Bin 0 -> 89241 bytes assets/static/images/tb95/onion-names(a)2x.png | Bin 0 -> 306049 bytes assets/static/images/tb95/onion-url-bar-update.png | Bin 0 -> 39914 bytes .../static/images/tb95/onion-url-bar-update(a)2x.png | Bin 0 -> 108234 bytes .../png/TBAa-onboarding.png | Bin 58890 -> 54696 bytes .../png/TBAa-onboarding(a)2x.png | Bin 159182 -> 145259 bytes assets/static/js | 2 +- assets/static/keys/dawuud.txt | 471 -- assets/static/keys/dennisjackson.txt | 52 + assets/static/keys/jnewsome.txt | 52 + assets/static/keys/juris.txt | 321 - assets/static/keys/nyinz.txt | 57 - assets/static/keys/sstevenson.txt | 79 + assets/static/keys/t0mmy.txt | 51 - configs/i18n.ini | 2 +- content/about/cy-pres/contents.lr | 6 +- content/about/history/contents.lr | 4 +- .../about/jobs/backend-engineer-ooni/contents.lr | 6 +- content/about/jobs/browser-developer/contents.lr | 2 + .../jobs/developer-data-architect/contents.lr | 2 + content/about/jobs/executive-assistant/contents.lr | 105 + .../jobs/senior-system-administrator/contents.lr | 2 + .../jobs/shadow-simulation-developer/contents.lr | 91 + content/about/people/acute/contents.lr | 19 + content/about/people/agrabeli/contents.lr | 2 +- content/about/people/ahf/contents.lr | 2 +- content/about/people/ailanthus/contents.lr | 19 - content/about/people/anarcat/contents.lr | 17 + content/about/people/arma/contents.lr | 4 +- content/about/people/dawuud/contents.lr | 20 - content/about/people/djackson/contents.lr | 21 + content/about/people/geko/contents.lr | 2 +- content/about/people/ggus/contents.lr | 6 +- content/about/people/hellais/contents.lr | 2 +- content/about/people/igt0/contents.lr | 17 - content/about/people/isra/contents.lr | 15 - content/about/people/jnewsome/contents.lr | 23 + content/about/people/juga/contents.lr | 2 +- content/about/people/juris/contents.lr | 15 - content/about/people/leif/contents.lr | 13 - content/about/people/meejah/contents.lr | 2 + content/about/people/narrira/contents.lr | 17 + content/about/people/pepijn/contents.lr | 19 - content/about/people/sajolida/contents.lr | 2 +- content/about/people/schneier-core/contents.lr | 15 + content/about/people/schneier/contents.lr | 13 + content/about/people/sengler/contents.lr | 17 + content/about/people/sstevenson/contents.lr | 4 + content/about/people/wayward/contents.lr | 19 - content/about/people/wshackleton/contents.lr | 20 + .../about/reports/2009-data-collection/contents.lr | 2 +- .../about/reports/2010-irs-form-990/contents.lr | 4 +- content/about/reports/2011-form-pc/contents.lr | 2 +- .../reports/2012-financial-statements/contents.lr | 2 +- content/about/reports/2012-form-pc/contents.lr | 2 +- content/about/reports/2013-form-pc/contents.lr | 2 +- .../2016-12-05-tor-project-bylaws/contents.lr | 6 +- .../about/sponsors/DARPA-georgetown/contents.lr | 19 + content/about/sponsors/DARPA-penn/contents.lr | 6 +- content/about/sponsors/RIPE NCC/.gitkeep | 0 .../about/sponsors/USSD-DHRL-harvard/contents.lr | 4 +- content/about/sponsors/USSD-DHRL/contents.lr | 3 +- content/about/sponsors/Zcash/contents.lr | 20 + .../craig-newmark-philanthropies/contents.lr | 19 + content/about/sponsors/dial/contents.lr | 19 + content/about/sponsors/google-soc/contents.lr | 14 +- content/about/sponsors/google-sod/contents.lr | 4 +- content/about/sponsors/handshake/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 4 +- content/about/sponsors/mullvad-vpn/contents.lr | 19 + content/about/sponsors/nsf-georgetown/contents.lr | 12 +- content/about/sponsors/nsf-minnesota/contents.lr | 2 +- content/about/sponsors/nsf-rochester/contents.lr | 4 +- content/about/sponsors/otf/contents.lr | 3 +- content/about/sponsors/ripe-ncc/contents.lr | 19 + content/about/sponsors/rose/contents.lr | 2 +- content/about/trademark/contents.lr | 21 + content/about/trademark/trademark-faq/contents.lr | 15 + .../trademark-faq/trademark-faq-1/contents.lr | 13 + .../trademark-faq/trademark-faq-2/contents.lr | 12 + .../trademark-faq/trademark-faq-3/contents.lr | 13 + .../trademark-faq/trademark-faq-4/contents.lr | 16 + .../trademark-faq/trademark-faq-5/contents.lr | 21 + .../trademark-faq/trademark-faq-6/contents.lr | 10 + .../trademark-faq/trademark-faq-7/contents.lr | 13 + content/download/alpha/contents.lr | 2 +- content/download/languages/contents.lr | 2 +- content/menu/contents.lr | 2 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../bbc-news-launches-tor-mirror-site/contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../interview-with-the-tor-project/contents.lr | 19 + .../contents.lr | 19 + content/press/new-release-tor-browser/contents.lr | 2 +- .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + content/privchat/contents.lr | 3 + .../torbrowser/RecommendedTBBVersions/contents.lr | 24 +- content/releases/contents.lr | 11 + content/releases/tor-browser-95/contents.lr | 83 + content/thank-you/contents.lr | 1 - databags/about+bn-BD.ini | 1 - databags/about+de.ini | 1 - databags/about+es.ini | 1 - databags/about+fr.ini | 1 - databags/about+id.ini | 1 - databags/about+is.ini | 1 - databags/about+it.ini | 1 - databags/about+ka.ini | 1 - databags/about+ko.ini | 1 - databags/about+pt-BR.ini | 1 - databags/about+ru.ini | 1 - databags/about+tr.ini | 1 - databags/about+zh-CN.ini | 1 - databags/{about+en.ini => about.ini} | 5 + databags/alternatives.ini | 8 +- databags/download-alternatives-alpha.ini | 14 +- databags/download-alternatives.ini | 22 +- databags/links.ini | 1 + databags/menu+bn-BD.ini | 19 - databags/menu+de.ini | 19 - databags/menu+en.ini | 19 - databags/menu+es.ini | 19 - databags/menu+fr.ini | 19 - databags/menu+id.ini | 19 - databags/menu+is.ini | 19 - databags/menu+it.ini | 19 - databags/menu+ka.ini | 19 - databags/menu+ko.ini | 19 - databags/menu+pt-BR.ini | 19 - databags/menu+ru.ini | 19 - databags/menu+tr.ini | 19 - databags/menu+zh-CN.ini | 19 - databags/menu.ini | 1 + databags/menu_footer+bn-BD.ini | 1 - databags/menu_footer+de.ini | 1 - databags/menu_footer+en.ini | 15 - databags/menu_footer+es.ini | 1 - databags/menu_footer+fr.ini | 1 - databags/menu_footer+id.ini | 1 - databags/menu_footer+is.ini | 1 - databags/menu_footer+it.ini | 1 - databags/menu_footer+ka.ini | 1 - databags/menu_footer+ko.ini | 1 - databags/menu_footer+pt-BR.ini | 1 - databags/menu_footer+ru.ini | 1 - databags/menu_footer+tr.ini | 1 - databags/menu_footer+zh-CN.ini | 1 - databags/menu_footer.ini | 1 + databags/platforms.ini | 4 +- databags/versions.ini | 20 +- lego | 2 +- models/job.ini | 4 + models/person.ini | 5 + models/question.ini | 20 + models/topic.ini | 23 + models/trademark.ini | 34 + templates/about.html | 16 +- templates/banner.html | 1 + templates/contact.html | 13 +- templates/download-android.html | 34 +- templates/download-languages.html | 6 +- templates/download-options.html | 44 +- templates/download-tor.html | 14 +- templates/download.html | 6 +- templates/footer-min.html | 92 + templates/hero-download.html | 32 +- templates/home.html | 2 +- templates/homepage.html | 18 +- templates/jobs.html | 2 +- templates/layout.html | 13 +- templates/macros/contact.html | 2 +- templates/macros/downloads.html | 19 +- templates/macros/footer.html | 2 +- templates/macros/people.html | 5 +- templates/macros/question.html | 22 + templates/macros/topic.html | 18 + templates/meta.html | 16 +- templates/navbar-min.html | 49 + templates/people.html | 24 +- templates/privchat.html | 111 + templates/question.html | 6 + templates/release.html | 65 + templates/releases.html | 14 + templates/sidenav.html | 5 +- templates/thank-you.html | 18 +- templates/topic.html | 6 + templates/trademark.html | 6 + tpo.lektorproject | 7 +- 250 files changed, 10086 insertions(+), 1529 deletions(-)

1 0

[tpo/staging] Add membership program page
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 0c73fa4b871f89e95b82f8438e64043a27b707ba Author: antonela <antonela(a)torproject.org> Date: Mon Jul 20 11:34:18 2020 -0300 Add membership program page --- assets/static/images/membership/green.png | Bin 0 -> 239288 bytes assets/static/images/membership/shallot.png | Bin 0 -> 208458 bytes assets/static/images/membership/vidalia.png | Bin 0 -> 169283 bytes content/about/membership/contents.lr | 13 +++ templates/membership.html | 152 ++++++++++++++++++++++++++++ 5 files changed, 165 insertions(+) diff --git a/assets/static/images/membership/green.png b/assets/static/images/membership/green.png new file mode 100644 index 00000000..c98a2222 Binary files /dev/null and b/assets/static/images/membership/green.png differ diff --git a/assets/static/images/membership/shallot.png b/assets/static/images/membership/shallot.png new file mode 100644 index 00000000..985a38d3 Binary files /dev/null and b/assets/static/images/membership/shallot.png differ diff --git a/assets/static/images/membership/vidalia.png b/assets/static/images/membership/vidalia.png new file mode 100644 index 00000000..4c70c63a Binary files /dev/null and b/assets/static/images/membership/vidalia.png differ diff --git a/content/about/membership/contents.lr b/content/about/membership/contents.lr new file mode 100644 index 00000000..fd7aa00f --- /dev/null +++ b/content/about/membership/contents.lr @@ -0,0 +1,13 @@ +section: About +--- +section_id: membership +--- +html: membership.html +--- +color: primary +--- +title: Membership +--- +body: + +Community has always been at the heart of Tor's strength. In this spirit, we created the Tor Project's Membership Program. Our goal is to build a supportive relationship between our nonprofit and private sector companies and organizations that use our technology or want to support our mission. diff --git a/templates/membership.html b/templates/membership.html new file mode 100644 index 00000000..6fc3cbd0 --- /dev/null +++ b/templates/membership.html @@ -0,0 +1,152 @@ +<div class="container py-3"> + <h3 class="text-primary display-5">{{ _('Show your support for privacy online') }}</h3> + <p>{{ _('When your organization joins the Tor Project’s Membership Program, you are demonstrating your commitment to privacy online and supporting Tor’s agility and development. In return, you become a closer part of our community with three specific benefits: access to our Onion Advisors group to help you integrate Tor into your product, inclusion in conversations and exclusive meetings with the Tor Project team to learn about what we are cooking at Tor, and public promotion of your membership. + If you are interested in becoming a member, please reach out to us at giving(a)torproject.org.') }}</p> +</div> +<div class="container py-3"> + <h3 class="text-primary display-5">{{ _('Membership Tiers') }}</h3> + <p>{{ _('Membership tiers differ in their level of public promotion. No matter the level of your contribution, members receive the same community benefits: access to our Onion Advisors group to help integrate Tor into your project and inclusion in conversations and exclusive meetings with the Tor Project team. At Tor, we love all of the onions, but shallots are the tastiest!') }}</p> +</div> +<div class="container"> + <div class="row py-3"> + <div class="col"> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/green.png' }}" /> + </div> + <div class="col-sm-8"> + <h4 class="h2 col-12 text-primary p-0">{{ _('Green Onion Member') }}</h4> + <p class="nick">{{ _('$10,000 - $49,999 per year') }}</p> + <p>{{ _('Your organization’s name, linking back to your website, is featured on our Membership Program page.') }}</p> + </div> + </div> + <div class="row py-3"> + <div class="col"> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/vidalia.png' }}" /> + </div> + <div class="col-sm-8"> + <h4 class="h2 col-12 text-primary p-0">{{ _('Vidalia Onion Member') }}</h4> + <p class="nick">{{ _('$50,000 - $99,999 per year') }}</p> + <p>{{ _('Your organization’s logo, linking back to your website, is featured on our Membership Program page. We will also engage in social media promotion.') }}</p> + </div> + </div> + <div class="row py-3"> + <div class="col"> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/shallot.png' }}" /> + </div> + <div class="col-sm-8"> + <h4 class="h2 col-12 text-primary p-0">{{ _('Shallot Onion Member') }}</h4> + <p class="nick">{{ _('≥ $100,000 per year year') }}</p> + <p>{{ _('Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.') }}</p> + </div> + </div> +</div> +<div class="container"> + <div class="row py-5"> + <h3 class="col-12 text-primary display-4">{{ _('Shallot Onion Members') }}</h3> + <div class="col-md-4 col-xl-4 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + <div class="card-body"> + <h4><a href="#">Shallot Onion Member</a></h4> + Some description + </div> + </div> + </div> + <div class="col-md-4 col-xl-4 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + <div class="card-body"> + <h4><a href="#">Shallot Onion Member</a></h4> + Some description + </div> + </div> + </div> + <div class="col-md-4 col-xl-4 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + <div class="card-body"> + <h4><a href="#">Shallot Onion Member</a></h4> + Some description + </div> + </div> + </div> + </div> +</div> +<div class="container"> + <div class="row py-5"> + <h3 class="col-12 text-primary display-4">{{ _('Vidalia Onion Members') }}</h3> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt="Card image cap"> + </div> + </div> + </div> +</div> +<div class="container"> + <div class="row py-5"> + <h3 class="col-12 text-primary display-4">{{ _('Green Onion Members') }}</h3> + <div class="col-md-6"> + <ul class="jobs-ul"> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + </ul> + </div> + <div class="col-md-6"> + <ul class="jobs-ul"> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + </ul> + </div> + </div> +</div> +<div class="row col-sm-8 py-5 text-center mx-auto"> + <h2 class="text-primary text-center mx-auto">{{ _('Become a Member') }}</h2> + <p class="text-center"> + {{ _('Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.') }}</p> +</div>

1 0

[tpo/staging] Merge branch 'membership' into staging
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 185acdd066cdbfbfe58dec255c733dc678d68429 Merge: dbb16bef 0c73fa4b Author: gus <gus(a)torproject.org> Date: Mon Jul 20 13:24:24 2020 -0400 Merge branch 'membership' into staging assets/static/images/membership/green.png | Bin 0 -> 239288 bytes assets/static/images/membership/shallot.png | Bin 0 -> 208458 bytes assets/static/images/membership/vidalia.png | Bin 0 -> 169283 bytes content/about/membership/contents.lr | 13 +++ templates/membership.html | 152 ++++++++++++++++++++++++++++ 5 files changed, 165 insertions(+)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 20 Jul '20

20 Jul '20

commit 091051ab17cd83d51e52ef21070725ad52e1d948 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 20 17:15:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 3fd0a67649..27152bb6a0 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -2444,7 +2444,7 @@ msgstr "[ ] მოახსენეთ პირადად ერთობ #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.title) msgid "Training Best Practices" -msgstr "" +msgstr "გადამზადების ჩასატარებლად გამოცდილი რჩევები" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.subtitle) @@ -2453,6 +2453,9 @@ msgid "" "Good preparation is essential to an effective and safe training, so we've " "curated some resources to help you make the most of your training event." msgstr "" +"კარგი მომზადება გადამწყვეტია შედეგიანი და უსაფრთხო გადამზადების " +"ჩასატარებლად, ასე რომ ჩვენ გაგვაჩნია მასალები, რომლებიც დაგეხმარებათ " +"საუკეთესო შედეგის მიღწევაში." #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.cta) @@ -2469,7 +2472,7 @@ msgstr "" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) msgid "## Before the training" -msgstr "" +msgstr "## გადამზადების დაწყებამდე" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) @@ -3386,7 +3389,7 @@ msgstr "" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 1: Get a web server working" -msgstr "" +msgstr "## ნაბიჯი 1: აამუშავეთ ვებსერვერი" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3931,12 +3934,12 @@ msgstr "" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.title) msgid "Translation Style Guide" -msgstr "" +msgstr "მითითებები თარგმნისთვის" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.subtitle) msgid "Here some rules" -msgstr "" +msgstr "ზოგიერთი წესი" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) @@ -3949,12 +3952,12 @@ msgstr "" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "### Spanish" -msgstr "" +msgstr "### ესპანური" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "#### Voice and Tone:" -msgstr "" +msgstr "#### ხმა და ბგერა:" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) @@ -3964,22 +3967,22 @@ msgstr "" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "#### Naming" -msgstr "" +msgstr "#### სახელები" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "#### Capitalization" -msgstr "" +msgstr "#### გამთავრულება" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "#### Other punctuation marks" -msgstr "" +msgstr "#### სხვა სასვენი ნიშნები" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "### French" -msgstr "" +msgstr "### ფრანგული" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) @@ -3989,7 +3992,7 @@ msgstr "" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "### German" -msgstr "" +msgstr "### გერმანული" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) @@ -4009,24 +4012,27 @@ msgstr "" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "- Run a spell check" -msgstr "" +msgstr "- გადაატარეთ მართლწერის შემოწმება" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "- Check all numbers for accuracy" -msgstr "" +msgstr "- შეამოწმეთ ყველ რიცხვის სისწორე" #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "" "- Make sure formatting is consistent, such as header size and bullet points." msgstr "" +"- გადაამოწმეთ გაფორმების მდგრადობა, სათაურების ზომა, დაუნომრავი სიები." #: https//community.torproject.org/localization/style-guide/ #: (content/localization/style-guide/contents+en.lrpage.body) msgid "" "- Ensure that all diacritical marks (such as: à, é, î, ñ, ü) are accurate." msgstr "" +"- დარწმუნდით, რომ ყველა დიაკრიტიკული ნიშანი (როგორიცაა: à, é, î, ñ, ü) " +"სწორადაა." #: https//community.torproject.org/outreach/kit/ #: (content/outreach/kit/contents+en.lrpage.title) @@ -4077,7 +4083,7 @@ msgstr "გადამცემის გაშვების შემდგ #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "#1. Make sure relay ports can be reached" -msgstr "" +msgstr "#1. დარწმუნდით, რომ გადამცემის პორტები მიუწვდომელი არაა" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4104,7 +4110,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 2. Verify that your relay works" -msgstr "" +msgstr "# 2. გადაამოწმეთ, რომ თქვენი გადამცემი მუშაობს" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -4293,6 +4299,8 @@ msgstr "" #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "# 6. Optional: Limiting bandwidth usage (and traffic)" msgstr "" +"# 6. არასავალდებულო: შეზღუდეთ გამტარუნარიანობით სარგებლობა (ასევე " +"მონაცემების მიმოცვლა)" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body)

1 0

[tpo/staging] Add missing comma in versions list
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit b063dde5138f26faa1896f3b7f19d20329b8e10b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 8 16:12:48 2020 +0000 Add missing comma in versions list --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 99bfd39a..36ba2b9d 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -20,7 +20,7 @@ body: "9.5a13", "9.5a13-MacOS", "9.5a13-Linux", -"9.5a13-Windows" +"9.5a13-Windows", "10.0a1", "10.0a1-MacOS", "10.0a1-Linux",

1 0

[tpo/staging] Updating because we're getting 4 students funded by GSoC this summer
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 083667c3877ccfa491d637ca281698e4f73dda01 Author: Bekeela Davila <bekeela(a)torproject.org> Date: Thu Jun 11 17:32:10 2020 +0000 Updating because we're getting 4 students funded by GSoC this summer --- content/about/sponsors/google-soc/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/google-soc/contents.lr b/content/about/sponsors/google-soc/contents.lr index 68255445..e445751f 100644 --- a/content/about/sponsors/google-soc/contents.lr +++ b/content/about/sponsors/google-soc/contents.lr @@ -1,8 +1,8 @@ _model: sponsor --- -active: False +active: true --- -time: 2007-2014 and 2016-2017 +time: 2007-2014 and 2016-2017 and 2020 --- name: Google Summer of Code ---

1 0

[tpo/staging] Deprecate old Tor Browser version (9.0.10, 9.5a12, 9.5a13)
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 65a2553b92327f64c8413d0ede5760a04ce13ee9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 8 16:15:40 2020 +0000 Deprecate old Tor Browser version (9.0.10, 9.5a12, 9.5a13) --- .../projects/torbrowser/RecommendedTBBVersions/contents.lr | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 36ba2b9d..70c945b9 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,22 +5,10 @@ _template: empty.html body: [ -"9.0.10", -"9.0.10-MacOS", -"9.0.10-Linux", -"9.0.10-Windows", "9.5", "9.5-MacOS", "9.5-Linux", "9.5-Windows", -"9.5a12", -"9.5a12-MacOS", -"9.5a12-Linux", -"9.5a12-Windows", -"9.5a13", -"9.5a13-MacOS", -"9.5a13-Linux", -"9.5a13-Windows", "10.0a1", "10.0a1-MacOS", "10.0a1-Linux",

1 0

[tpo/staging] added dial back to current sponsor list as they are currently paying for our two Outreachy students
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 0dea327171d9528ec00ca8c0d22d904c61906eaa Author: Bekeela Davila <bekeela(a)torproject.org> Date: Thu Jun 11 17:29:56 2020 +0000 added dial back to current sponsor list as they are currently paying for our two Outreachy students --- content/about/sponsors/dial/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/dial/contents.lr b/content/about/sponsors/dial/contents.lr index 5e17bef1..02be8ec1 100644 --- a/content/about/sponsors/dial/contents.lr +++ b/content/about/sponsors/dial/contents.lr @@ -1,8 +1,8 @@ _model: sponsor --- -active: False +active: True --- -time: 2019 +time: 2020 --- name: Digital Impact Alliance ---

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2020