tor-commits June 2020

tor-commits@lists.torproject.org

17 participants
1326 discussions

[dev/staging] Update lego
by pili＠torproject.org 17 Jun '20

17 Jun '20

commit e1a58d76693460743d8eb254080a51beb6cbe449 Author: hiro <hiro(a)torproject.org> Date: Fri May 15 14:52:41 2020 +0200 Update lego --- databags/menu+bn-BD.ini | 1 - databags/menu+de.ini | 1 - databags/menu+en.ini | 1 - databags/menu+es.ini | 1 - databags/menu+fr.ini | 1 - databags/menu+id.ini | 1 - databags/menu+is.ini | 1 - databags/menu+it.ini | 1 - databags/menu+ka.ini | 1 - databags/menu+ko.ini | 1 - databags/menu+pt-BR.ini | 1 - databags/menu+ru.ini | 1 - databags/menu+tr.ini | 1 - databags/menu+zh-CN.ini | 1 - databags/menu_footer+bn-BD.ini | 1 - databags/menu_footer+de.ini | 1 - databags/menu_footer+en.ini | 1 - 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/pagenav+de.ini | 1 - databags/pagenav+es.ini | 1 - databags/pagenav+fr.ini | 1 - databags/pagenav+it.ini | 1 - databags/pagenav+pt-BR.ini | 1 - databags/pagenav+ru.ini | 1 - lego | 2 +- 35 files changed, 1 insertion(+), 35 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini deleted file mode 120000 index c9b2dc8..0000000 --- a/databags/menu+bn-BD.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+bn-BD.ini \ No newline at end of file diff --git a/databags/menu+de.ini b/databags/menu+de.ini deleted file mode 120000 index 6bb02de..0000000 --- a/databags/menu+de.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+de.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 120000 index 1fa7edf..0000000 --- a/databags/menu+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini deleted file mode 120000 index fd8def3..0000000 --- a/databags/menu+es.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+es.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini deleted file mode 120000 index 5366289..0000000 --- a/databags/menu+fr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+fr.ini \ No newline at end of file diff --git a/databags/menu+id.ini b/databags/menu+id.ini deleted file mode 120000 index 7c2858b..0000000 --- a/databags/menu+id.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+id.ini \ No newline at end of file diff --git a/databags/menu+is.ini b/databags/menu+is.ini deleted file mode 120000 index b02aed7..0000000 --- a/databags/menu+is.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+is.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini deleted file mode 120000 index fcdde73..0000000 --- a/databags/menu+it.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+it.ini \ No newline at end of file diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini deleted file mode 120000 index 336d4ad..0000000 --- a/databags/menu+ka.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ka.ini \ No newline at end of file diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini deleted file mode 120000 index 31e262b..0000000 --- a/databags/menu+ko.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ko.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini deleted file mode 120000 index fd27afb..0000000 --- a/databags/menu+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+pt-BR.ini \ No newline at end of file diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini deleted file mode 120000 index 6f30a3e..0000000 --- a/databags/menu+ru.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ru.ini \ No newline at end of file diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini deleted file mode 120000 index 8a01592..0000000 --- a/databags/menu+tr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+tr.ini \ No newline at end of file diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini deleted file mode 120000 index 425a6f8..0000000 --- a/databags/menu+zh-CN.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+zh-CN.ini \ No newline at end of file diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini deleted file mode 120000 index 5dd8aed..0000000 --- a/databags/menu_footer+bn-BD.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+bn-BD.ini \ No newline at end of file diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini deleted file mode 120000 index 851da53..0000000 --- a/databags/menu_footer+de.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+de.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini deleted file mode 120000 index c52cdcb..0000000 --- a/databags/menu_footer+es.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+es.ini \ No newline at end of file diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini deleted file mode 120000 index 7ce02c3..0000000 --- a/databags/menu_footer+fr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+fr.ini \ No newline at end of file diff --git a/databags/menu_footer+id.ini b/databags/menu_footer+id.ini deleted file mode 120000 index 056defd..0000000 --- a/databags/menu_footer+id.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+id.ini \ No newline at end of file diff --git a/databags/menu_footer+is.ini b/databags/menu_footer+is.ini deleted file mode 120000 index 2474621..0000000 --- a/databags/menu_footer+is.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+is.ini \ No newline at end of file diff --git a/databags/menu_footer+it.ini b/databags/menu_footer+it.ini deleted file mode 120000 index 8225a53..0000000 --- a/databags/menu_footer+it.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+it.ini \ No newline at end of file diff --git a/databags/menu_footer+ka.ini b/databags/menu_footer+ka.ini deleted file mode 120000 index fd41467..0000000 --- a/databags/menu_footer+ka.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ka.ini \ No newline at end of file diff --git a/databags/menu_footer+ko.ini b/databags/menu_footer+ko.ini deleted file mode 120000 index 6ff3bf2..0000000 --- a/databags/menu_footer+ko.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ko.ini \ No newline at end of file diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini deleted file mode 120000 index 5198e0f..0000000 --- a/databags/menu_footer+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+pt-BR.ini \ No newline at end of file diff --git a/databags/menu_footer+ru.ini b/databags/menu_footer+ru.ini deleted file mode 120000 index ad782bc..0000000 --- a/databags/menu_footer+ru.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ru.ini \ No newline at end of file diff --git a/databags/menu_footer+tr.ini b/databags/menu_footer+tr.ini deleted file mode 120000 index 2c88858..0000000 --- a/databags/menu_footer+tr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+tr.ini \ No newline at end of file diff --git a/databags/menu_footer+zh-CN.ini b/databags/menu_footer+zh-CN.ini deleted file mode 120000 index 0fd8366..0000000 --- a/databags/menu_footer+zh-CN.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+zh-CN.ini \ No newline at end of file diff --git a/databags/pagenav+de.ini b/databags/pagenav+de.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+de.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+es.ini b/databags/pagenav+es.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+es.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+fr.ini b/databags/pagenav+fr.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+fr.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+it.ini b/databags/pagenav+it.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+it.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+pt-BR.ini b/databags/pagenav+pt-BR.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+ru.ini b/databags/pagenav+ru.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+ru.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/lego b/lego index abbf18c..7f2289b 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit abbf18cb1bbca70caeb8913d2b60f0cb9332f287 +Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3

1 0

[dev/staging] Project ideas pages for future GSoC/Outreachy/etc... iterations
by pili＠torproject.org 17 Jun '20

17 Jun '20

commit 56428a833e593885fd666c072534107be6c06759 Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Jun 17 14:12:56 2020 +0100 Project ideas pages for future GSoC/Outreachy/etc... iterations --- .../cloudflare-captcha-monitoring/contents.lr | 2 +- .../project-ideas/gettor-distribution/contents.lr | 2 +- content/project-ideas/onion-toolbox/contents.lr | 2 +- .../ooni-explorer-advanced-search/contents.lr | 2 +- .../ooni-probe-experiments/contents.lr | 2 +- .../privacy-aware-geo-lookup/contents.lr | 2 +- .../project-ideas/privacy-friendly-web/contents.lr | 2 +- .../salmon-bridge-distribution/contents.lr | 2 +- .../snowflake-android-proxy/contents.lr | 2 +- content/project-ideas/tor-keygen/contents.lr | 2 +- .../tor-relay-ipv6-support/contents.lr | 2 +- content/project-ideas/tor-weather/contents.lr | 2 +- templates/project-page.html | 43 ++++++++++++++++++++++ 13 files changed, 55 insertions(+), 12 deletions(-) diff --git a/content/project-ideas/cloudflare-captcha-monitoring/contents.lr b/content/project-ideas/cloudflare-captcha-monitoring/contents.lr index c311934..1726aeb 100644 --- a/content/project-ideas/cloudflare-captcha-monitoring/contents.lr +++ b/content/project-ideas/cloudflare-captcha-monitoring/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/gettor-distribution/contents.lr b/content/project-ideas/gettor-distribution/contents.lr index 797a2ff..e3d664e 100644 --- a/content/project-ideas/gettor-distribution/contents.lr +++ b/content/project-ideas/gettor-distribution/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/onion-toolbox/contents.lr b/content/project-ideas/onion-toolbox/contents.lr index 1d52e87..07de9c0 100644 --- a/content/project-ideas/onion-toolbox/contents.lr +++ b/content/project-ideas/onion-toolbox/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/ooni-explorer-advanced-search/contents.lr b/content/project-ideas/ooni-explorer-advanced-search/contents.lr index be381fd..219ad3a 100644 --- a/content/project-ideas/ooni-explorer-advanced-search/contents.lr +++ b/content/project-ideas/ooni-explorer-advanced-search/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/ooni-probe-experiments/contents.lr b/content/project-ideas/ooni-probe-experiments/contents.lr index 1eb568e..a9f87ab 100644 --- a/content/project-ideas/ooni-probe-experiments/contents.lr +++ b/content/project-ideas/ooni-probe-experiments/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/privacy-aware-geo-lookup/contents.lr b/content/project-ideas/privacy-aware-geo-lookup/contents.lr index e170747..301b44a 100644 --- a/content/project-ideas/privacy-aware-geo-lookup/contents.lr +++ b/content/project-ideas/privacy-aware-geo-lookup/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/privacy-friendly-web/contents.lr b/content/project-ideas/privacy-friendly-web/contents.lr index 7ab642b..e464859 100644 --- a/content/project-ideas/privacy-friendly-web/contents.lr +++ b/content/project-ideas/privacy-friendly-web/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/salmon-bridge-distribution/contents.lr b/content/project-ideas/salmon-bridge-distribution/contents.lr index 8ec5614..fd9fc25 100644 --- a/content/project-ideas/salmon-bridge-distribution/contents.lr +++ b/content/project-ideas/salmon-bridge-distribution/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/snowflake-android-proxy/contents.lr b/content/project-ideas/snowflake-android-proxy/contents.lr index f922efb..a3213fa 100644 --- a/content/project-ideas/snowflake-android-proxy/contents.lr +++ b/content/project-ideas/snowflake-android-proxy/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/tor-keygen/contents.lr b/content/project-ideas/tor-keygen/contents.lr index f32192f..5b41591 100644 --- a/content/project-ideas/tor-keygen/contents.lr +++ b/content/project-ideas/tor-keygen/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/tor-relay-ipv6-support/contents.lr b/content/project-ideas/tor-relay-ipv6-support/contents.lr index 86518a2..d327d6a 100644 --- a/content/project-ideas/tor-relay-ipv6-support/contents.lr +++ b/content/project-ideas/tor-relay-ipv6-support/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/content/project-ideas/tor-weather/contents.lr b/content/project-ideas/tor-weather/contents.lr index 3023237..63744b2 100644 --- a/content/project-ideas/tor-weather/contents.lr +++ b/content/project-ideas/tor-weather/contents.lr @@ -1,4 +1,4 @@ -_model: project +_model: idea --- _template: layout.html --- diff --git a/templates/project-page.html b/templates/project-page.html index e69de29..dccc42c 100644 --- a/templates/project-page.html +++ b/templates/project-page.html @@ -0,0 +1,43 @@ +<div class="container pt-5 justify-content-center"> + <section> + <div class="container py-3 preamble"> + <p>{% block body %}{{ this.body }}{% endblock %} + </div> + </section> + <section> + <div class="container"> + <div class="row"> + {% for child in site.query('/').filter(F.section_id != 'gsoc')|sort(attribute='key') %} + <div class="col-sm-6 col-md-4 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <h2 class="card-title ">{{ child.title }}</h2> + <p class="card-text">{{ child.subtitle }}</p> + </div> + <a href="{{ child.path|url }}" class="btn btn-primary">Learn More</a> + </div> + </div> + {% endfor %} + </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Research') }}</h2> + <p class="text-center"> + {{ _('Many people around the world are doing research on how to improve the Tor design, what\'s going on in the Tor network, and more generally on attacks and defenses for anonymous communication systems. Our research portal holds the resources we provide to help make your Tor research more effective.')}} + </p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://research.torproject.org"> + {{ _('Research Portal') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> + </div> + </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Project Ideas') }}</h2> + <p class="text-center"> + {{ _('Here you will find some projects that may be good ideas for Outreachy, Google Summer of Code or other internship programs we may participate in in future.')}} + </p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="/project-ideas"> + {{ _('Learn More') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> + </div> + </div> + </section> +</div> \ No newline at end of file

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 17 Jun '20

17 Jun '20

commit 6885e6cd09162e0b6ade61d677c3b5438b1f7dbe Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 17 05:17:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- nl/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd index 0143044db6..aa8b25f105 100644 --- a/nl/network-settings.dtd +++ b/nl/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "Een verbinding maken">  -<!ENTITY torlauncher.localePicker.title "Tor-browsertaal"> +<!ENTITY torlauncher.localePicker.title "Taal van Tor Browser"> <!ENTITY torlauncher.localePicker.prompt "Selecteer een taal.">

1 0

[tor/release-0.4.4] Bump to 0.4.4.1-alpha-dev
by nickm＠torproject.org 16 Jun '20

16 Jun '20

commit 93d582b8e9ec60b78f52b31d56b7a946706f5dac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 16 19:38:38 2020 -0400 Bump to 0.4.4.1-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 2fb680572..ba5703aaf 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.4.1-alpha]) +AC_INIT([tor],[0.4.4.1-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-06-15"], # for 0.4.4.1-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-06-16"], # for 0.4.4.1-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 621a339a8..b81ff22c8 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.4.1-alpha" +!define VERSION "0.4.4.1-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index e38281ca2..ddcc3205c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.4.1-alpha" +#define VERSION "0.4.4.1-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 16 Jun '20

16 Jun '20

commit 8d094f2d26f6f793f2b41777547da44dd00eaa64 Merge: 1871693c5 93d582b8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 16 19:39:20 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.4] Bump to 0.4.4.1-alpha-dev
by nickm＠torproject.org 16 Jun '20

16 Jun '20

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 16 Jun '20

16 Jun '20

commit 48ff6a41aed1e2b57f1766206324bc9dc33c19d1 Merge: 0b889e709 93d582b8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 16 19:39:03 2020 -0400 Merge branch 'maint-0.4.4' "ours" to avoid version bump.

1 0

[tor/master] Bump to 0.4.4.1-alpha-dev
by nickm＠torproject.org 16 Jun '20

16 Jun '20

1 0

[tpo/master] Add gsoc logo to sponsors
by gus＠torproject.org 16 Jun '20

16 Jun '20

commit 6723f3e3f5c56da6cfba2c5be71ffc73fd372bf9 Author: gus <gus(a)torproject.org> Date: Tue Jun 16 18:58:05 2020 -0400 Add gsoc logo to sponsors --- assets/static/images/sponsors/gsoc.png | Bin 0 -> 33641 bytes content/about/sponsors/google-soc/contents.lr | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/static/images/sponsors/gsoc.png b/assets/static/images/sponsors/gsoc.png new file mode 100644 index 00000000..d282de40 Binary files /dev/null and b/assets/static/images/sponsors/gsoc.png differ diff --git a/content/about/sponsors/google-soc/contents.lr b/content/about/sponsors/google-soc/contents.lr index 32c58967..c2d21420 100644 --- a/content/about/sponsors/google-soc/contents.lr +++ b/content/about/sponsors/google-soc/contents.lr @@ -1,6 +1,6 @@ _model: sponsor --- -active: false +active: True --- time: 2007-2014 and 2016-2017 and 2020 --- @@ -17,4 +17,3 @@ link: https://summerofcode.withgoogle.com/ description: Google Summer of Code is a global program focused on introducing students to open source software development. Students work on a 3 month programming project with an open source organization during their break from university. -

1 0

[tpo/master] updating content with logo and description
by gus＠torproject.org 16 Jun '20

16 Jun '20

commit 0efe650bc0e3edc5210949ecc148bdc52f7460fd Author: Bekeela Davila <bekeela(a)torproject.org> Date: Fri Jun 12 16:24:38 2020 +0000 updating content with logo and description --- content/about/sponsors/google-soc/contents.lr | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/content/about/sponsors/google-soc/contents.lr b/content/about/sponsors/google-soc/contents.lr index 5ed76741..32c58967 100644 --- a/content/about/sponsors/google-soc/contents.lr +++ b/content/about/sponsors/google-soc/contents.lr @@ -6,6 +6,15 @@ time: 2007-2014 and 2016-2017 and 2020 --- name: Google Summer of Code --- +key: 22 +--- +logo: /static/images/sponsors/gsoc.png +--- _hidden: yes --- -link: https://developers.google.com/open-source/gsoc/ +link: https://summerofcode.withgoogle.com/ +--- +description: + +Google Summer of Code is a global program focused on introducing students to open source software development. Students work on a 3 month programming project with an open source organization during their break from university. +

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2020