[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-07-27 Thread translation
commit 7503add09a7e107402ebfee202a66e29fcd94ed0 Author: Translation commit bot Date: Tue Jul 28 03:16:50 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-07-27 Thread translation
commit 61f3665a6c0b81effc51b42facb2938d29441b3b Author: Translation commit bot Date: Tue Jul 28 02:46:51 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 56 +--- 1 file

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-07-27 Thread translation
commit 50f8cdfdd9e0b9d4182b610eea9d24a9fe4959f0 Author: Translation commit bot Date: Tue Jul 28 02:16:47 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+es.po

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-07-27 Thread translation
commit 5606317561ffb28a861e0e4f9416b8521a97c421 Author: Translation commit bot Date: Tue Jul 28 01:46:49 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+es.po

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2020-07-27 Thread translation
commit 28bb4e153dcbd98c2c0e728cdd627f42c82a019b Author: Translation commit bot Date: Tue Jul 28 01:16:44 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/maint-0.4.4] bump to 0.4.4.3-alpha-dev

2020-07-27 Thread nickm
commit 0a38e02fb3b2a4b707b6aaf989974a4c4d6e1adb Author: Nick Mathewson Date: Mon Jul 27 19:15:15 2020 -0400 bump to 0.4.4.3-alpha-dev --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed,

[tor-commits] [tor/release-0.4.4] bump to 0.4.4.3-alpha-dev

2020-07-27 Thread nickm
commit 0a38e02fb3b2a4b707b6aaf989974a4c4d6e1adb Author: Nick Mathewson Date: Mon Jul 27 19:15:15 2020 -0400 bump to 0.4.4.3-alpha-dev --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed,

[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

2020-07-27 Thread nickm
commit 6d3bb9a1a577bcfe173c604bd40dea34fd1d3a03 Merge: 98d84587a8 0a38e02fb3 Author: Nick Mathewson Date: Mon Jul 27 19:15:25 2020 -0400 Merge branch 'maint-0.4.4' "ours" to avoid version bump. ___ tor-commits mailing list

[tor-commits] [tor/master] copy forward the changelog from 0.4.4.3-alpha

2020-07-27 Thread nickm
commit 86de51feaf42688b8d7bd3e5bc228afda420d1da Author: Nick Mathewson Date: Mon Jul 27 19:16:15 2020 -0400 copy forward the changelog from 0.4.4.3-alpha --- ChangeLog | 51 +++ 1 file changed, 51 insertions(+) diff --git a/ChangeLog

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

2020-07-27 Thread nickm
commit ba4455538801cc924083bc1200254b9f4a05db13 Merge: c968889a09 0a38e02fb3 Author: Nick Mathewson Date: Mon Jul 27 19:15:39 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/master] bump to 0.4.4.3-alpha-dev

2020-07-27 Thread nickm
commit 0a38e02fb3b2a4b707b6aaf989974a4c4d6e1adb Author: Nick Mathewson Date: Mon Jul 27 19:15:15 2020 -0400 bump to 0.4.4.3-alpha-dev --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed,

[tor-commits] [tpo/master] Tor 0.4.4.3-alpha is released: update versions.ini

2020-07-27 Thread nickm
commit ce1b5e8dc4e33bbd2e29bbe9bd467f686af59e6c Author: Nick Mathewson Date: Mon Jul 27 18:59:24 2020 -0400 Tor 0.4.4.3-alpha is released: update versions.ini --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2020-07-27 Thread translation
commit 0cb4e789dd8cb3902b2297c7e88ae72fb68cdcc6 Author: Translation commit bot Date: Mon Jul 27 21:45:12 2020 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/ar/LC_MESSAGES/messages.po | 10 -- 1 file changed, 8 insertions(+), 2

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2020-07-27 Thread translation
commit 4509612c181aa6a0a0bfb7cef7953e6a6fea6db1 Author: Translation commit bot Date: Mon Jul 27 21:15:14 2020 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/ar/LC_MESSAGES/messages.po | 10 +- 1 file changed, 9 insertions(+), 1

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2020-07-27 Thread translation
commit 1d0edb8a150506466977a2e7acd47f15bdd66942 Author: Translation commit bot Date: Mon Jul 27 20:45:12 2020 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/ar/LC_MESSAGES/messages.po | 37 - 1 file

[tor-commits] [meek/turbotunnel] comment typo

2020-07-27 Thread dcf
commit 70ce713a9d48810dff51984498d7898f6d57374d Author: David Fifield Date: Fri Jul 10 14:50:43 2020 -0600 comment typo --- meek-client/turbotunnel.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meek-client/turbotunnel.go b/meek-client/turbotunnel.go index

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2020-07-27 Thread translation
commit 9d101c1abeebc859d674645a7da70b1da43f8b85 Author: Translation commit bot Date: Mon Jul 27 20:15:15 2020 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/ar/LC_MESSAGES/messages.po | 4 +++- 1 file changed, 3 insertions(+), 1

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2020-07-27 Thread translation
commit f4ad57400905247a438a6466057c0d01b835e03a Author: Translation commit bot Date: Mon Jul 27 19:45:19 2020 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/ar/LC_MESSAGES/messages.po | 30 ++ 1 file changed,

[tor-commits] [tpo/master] Merge remote-tracking branch 'anto-gl/master'

2020-07-27 Thread hiro
commit 432fc189de8b3d6650a5b38cb0c78e4f54570363 Merge: 7966c0d1 a4562ada Author: hiro Date: Mon Jul 27 21:35:23 2020 +0200 Merge remote-tracking branch 'anto-gl/master' templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tpo/master] Update membership.html - CC copy

2020-07-27 Thread hiro
commit a4562adaf8f0d59f80a053288550c37342b489d6 Author: Antonela Date: Mon Jul 27 19:22:47 2020 + Update membership.html - CC copy --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html

[tor-commits] [tpo/master] Merge remote-tracking branch 'gl/patch-1' into staging

2020-07-27 Thread hiro
commit 8497521629a3e702e9b5678b06627331765914c9 Merge: 323d5aa1 0bd20a54 Author: hiro Date: Mon Jul 27 20:59:50 2020 +0200 Merge remote-tracking branch 'gl/patch-1' into staging templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tpo/master] Remove .htacces-membership

2020-07-27 Thread hiro
commit 323d5aa1e9b0e3d4b2e22a86571ffcc5302b19b3 Author: hiro Date: Mon Jul 27 18:52:19 2020 +0200 Remove .htacces-membership --- .htaccess-membership | 4 1 file changed, 4 deletions(-) diff --git a/.htaccess-membership b/.htaccess-membership deleted file mode 100644 index

[tor-commits] [tpo/master] Merge branch 'staging'

2020-07-27 Thread hiro
commit 7966c0d197d74c7f5da1f30077a90e5e826b3391 Merge: ae36d114 84975216 Author: hiro Date: Mon Jul 27 21:00:25 2020 +0200 Merge branch 'staging' templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits

[tor-commits] [tpo/master] Update membership.html

2020-07-27 Thread hiro
commit 0bd20a54faa956d379932d833cb76d9ca77bdb01 Author: Antonela Date: Mon Jul 27 18:11:46 2020 + Update membership.html --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index

[tor-commits] [tpo/master] Merge remote-tracking branch 'anto-gl/master' into staging

2020-07-27 Thread hiro
commit 45cedd844b4a20df037521a6d9cd9eb17430c5c1 Merge: 1b2a2910 cfd88bad Author: hiro Date: Mon Jul 27 16:18:59 2020 +0200 Merge remote-tracking branch 'anto-gl/master' into staging assets/static/images/membership/logos/MullvadVPN.png | Bin 0 -> 21976 bytes templates/membership.html

[tor-commits] [tpo/master] Fix .htaccess-membership

2020-07-27 Thread hiro
commit 84f1011ca792d76ff099f9fc53335f5ff09969e7 Author: hiro Date: Mon Jul 27 18:38:52 2020 +0200 Fix .htaccess-membership --- .htaccess-membership | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.htaccess-membership b/.htaccess-membership index

[tor-commits] [tpo/master] Add .htaccess-membership to add http auth to /about/membership

2020-07-27 Thread hiro
commit 7adf1323c117fd07c2a87523dc0c6fd9decb6461 Author: hiro Date: Mon Jul 27 18:11:07 2020 +0200 Add .htaccess-membership to add http auth to /about/membership --- .htaccess-membership | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess-membership b/.htaccess-membership index

[tor-commits] [tpo/master] Add .htaccess for /about/membership

2020-07-27 Thread hiro
commit 1b2a2910470b6fb1039a29a275e8d6b6f87ad301 Author: hiro Date: Mon Jul 27 16:02:54 2020 +0200 Add .htaccess for /about/membership --- .htaccess-membership | 4 1 file changed, 4 insertions(+) diff --git a/.htaccess-membership b/.htaccess-membership new file mode 100644 index

[tor-commits] [tpo/master] Add .htaccess-membership to add http auth to /about/membership

2020-07-27 Thread hiro
commit ae36d114f8a919c1b4e418dd1d447898c5258a09 Author: hiro Date: Mon Jul 27 18:10:29 2020 +0200 Add .htaccess-membership to add http auth to /about/membership --- .htaccess-membership | 4 1 file changed, 4 insertions(+) diff --git a/.htaccess-membership b/.htaccess-membership new

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2020-07-27 Thread translation
commit ab59a632d991aeb33ac151a9815a8d180c480db9 Author: Translation commit bot Date: Mon Jul 27 18:45:12 2020 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/ar/LC_MESSAGES/messages.po | 12 ++-- 1 file changed, 6 insertions(+), 6

[tor-commits] [tor/master] Fix documentation of cache_failure_intro_lookup

2020-07-27 Thread nickm
commit 98d84587a8e9723f1c964e03de9364508be04b2f Author: Nick Mathewson Date: Mon Jul 27 14:22:10 2020 -0400 Fix documentation of cache_failure_intro_lookup Closes ticket 17793 --- src/feature/rend/rendcache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2020-07-27 Thread translation
commit ef35fa2cd314d7874b67d7d40d782cc2041ec7d6 Author: Translation commit bot Date: Mon Jul 27 18:15:14 2020 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/ar/LC_MESSAGES/messages.po | 46 ++- 1 file

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-07-27 Thread translation
commit a951fbeeb87cf2957ae10cc64bca32a0ef3796dc Author: Translation commit bot Date: Mon Jul 27 17:16:28 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es.po b/es.po

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-07-27 Thread translation
commit 500c84f0035e2466929b4b046a769d82763f3dbc Author: Translation commit bot Date: Mon Jul 27 17:15:45 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- es.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po b/es.po index

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-27 Thread nickm
commit c0bc30b6f0f643e06abfb70f18126155663ec4cc Merge: 3bcbd69a77 564a9a54a1 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/release-0.4.3] fallbackdir: Remove all three Digitalcourage3 relays

2020-07-27 Thread nickm
commit 564a9a54a14521ef59275fbb442f92fe385cccea Author: David Goulet Date: Fri Jul 24 14:56:05 2020 -0400 fallbackdir: Remove all three Digitalcourage3 relays They are about to be shutdown in September. Signed-off-by: David Goulet --- src/app/config/fallback_dirs.inc |

[tor-commits] [tor/release-0.4.4] fallbackdir: Remove all three Digitalcourage3 relays

2020-07-27 Thread nickm
commit 564a9a54a14521ef59275fbb442f92fe385cccea Author: David Goulet Date: Fri Jul 24 14:56:05 2020 -0400 fallbackdir: Remove all three Digitalcourage3 relays They are about to be shutdown in September. Signed-off-by: David Goulet --- src/app/config/fallback_dirs.inc |

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-07-27 Thread nickm
commit 31eba7f009367cd51e5bf5189a3a4f4ca7b404ac Merge: 95914ceb57 97d0cb83ed Author: Nick Mathewson Date: Mon Jul 27 12:56:19 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-27 Thread nickm
commit c0bc30b6f0f643e06abfb70f18126155663ec4cc Merge: 3bcbd69a77 564a9a54a1 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-07-27 Thread nickm
commit 31eba7f009367cd51e5bf5189a3a4f4ca7b404ac Merge: 95914ceb57 97d0cb83ed Author: Nick Mathewson Date: Mon Jul 27 12:56:19 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/master] fallbackdir: Remove all three Digitalcourage3 relays

2020-07-27 Thread nickm
commit 564a9a54a14521ef59275fbb442f92fe385cccea Author: David Goulet Date: Fri Jul 24 14:56:05 2020 -0400 fallbackdir: Remove all three Digitalcourage3 relays They are about to be shutdown in September. Signed-off-by: David Goulet --- src/app/config/fallback_dirs.inc |

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

2020-07-27 Thread nickm
commit c968889a09c453f25ab3b07f1d70e0743eb76b66 Merge: 4007af3373 31eba7f009 Author: Nick Mathewson Date: Mon Jul 27 12:56:19 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

2020-07-27 Thread nickm
commit 64d7b282982760e4f6f70f3cd9a396878ac64b2e Merge: c2e265e4e5 31eba7f009 Author: Nick Mathewson Date: Mon Jul 27 12:56:19 2020 -0400 Merge branch 'maint-0.4.4' src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-07-27 Thread nickm
commit 31eba7f009367cd51e5bf5189a3a4f4ca7b404ac Merge: 95914ceb57 97d0cb83ed Author: Nick Mathewson Date: Mon Jul 27 12:56:19 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/maint-0.4.4] fallbackdir: Remove all three Digitalcourage3 relays

2020-07-27 Thread nickm
commit 564a9a54a14521ef59275fbb442f92fe385cccea Author: David Goulet Date: Fri Jul 24 14:56:05 2020 -0400 fallbackdir: Remove all three Digitalcourage3 relays They are about to be shutdown in September. Signed-off-by: David Goulet --- src/app/config/fallback_dirs.inc |

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-27 Thread nickm
commit c0bc30b6f0f643e06abfb70f18126155663ec4cc Merge: 3bcbd69a77 564a9a54a1 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-27 Thread nickm
commit 97d0cb83ed096fea9917237d68fe7700fe9ed206 Merge: 6354b70e49 c0bc30b6f0 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

2020-07-27 Thread nickm
commit 061fcce5d5741c1f86ef40c6c79c073784ce7875 Merge: 56e5b0b2b6 c0bc30b6f0 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2020-07-27 Thread nickm
commit 09c35dcf03f6708d1f424826c1282608c9d60b61 Merge: 32f1501b96 564a9a54a1 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/release-0.4.2] fallbackdir: Remove all three Digitalcourage3 relays

2020-07-27 Thread nickm
commit 564a9a54a14521ef59275fbb442f92fe385cccea Author: David Goulet Date: Fri Jul 24 14:56:05 2020 -0400 fallbackdir: Remove all three Digitalcourage3 relays They are about to be shutdown in September. Signed-off-by: David Goulet --- src/app/config/fallback_dirs.inc |

[tor-commits] [tor/release-0.3.5] fallbackdir: Remove all three Digitalcourage3 relays

2020-07-27 Thread nickm
commit 564a9a54a14521ef59275fbb442f92fe385cccea Author: David Goulet Date: Fri Jul 24 14:56:05 2020 -0400 fallbackdir: Remove all three Digitalcourage3 relays They are about to be shutdown in September. Signed-off-by: David Goulet --- src/app/config/fallback_dirs.inc |

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-27 Thread nickm
commit c0bc30b6f0f643e06abfb70f18126155663ec4cc Merge: 3bcbd69a77 564a9a54a1 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-27 Thread nickm
commit c0bc30b6f0f643e06abfb70f18126155663ec4cc Merge: 3bcbd69a77 564a9a54a1 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-27 Thread nickm
commit 97d0cb83ed096fea9917237d68fe7700fe9ed206 Merge: 6354b70e49 c0bc30b6f0 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-27 Thread nickm
commit 97d0cb83ed096fea9917237d68fe7700fe9ed206 Merge: 6354b70e49 c0bc30b6f0 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

2020-07-27 Thread nickm
commit 8b5b0c2bda0ee7255a9e0e83b3816c70d8ad Merge: f7dbae4e89 97d0cb83ed Author: Nick Mathewson Date: Mon Jul 27 12:56:19 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/maint-0.4.2] fallbackdir: Remove all three Digitalcourage3 relays

2020-07-27 Thread nickm
commit 564a9a54a14521ef59275fbb442f92fe385cccea Author: David Goulet Date: Fri Jul 24 14:56:05 2020 -0400 fallbackdir: Remove all three Digitalcourage3 relays They are about to be shutdown in September. Signed-off-by: David Goulet --- src/app/config/fallback_dirs.inc |

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-27 Thread nickm
commit c0bc30b6f0f643e06abfb70f18126155663ec4cc Merge: 3bcbd69a77 564a9a54a1 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-07-27 Thread nickm
commit c0bc30b6f0f643e06abfb70f18126155663ec4cc Merge: 3bcbd69a77 564a9a54a1 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/maint-0.4.3] fallbackdir: Remove all three Digitalcourage3 relays

2020-07-27 Thread nickm
commit 564a9a54a14521ef59275fbb442f92fe385cccea Author: David Goulet Date: Fri Jul 24 14:56:05 2020 -0400 fallbackdir: Remove all three Digitalcourage3 relays They are about to be shutdown in September. Signed-off-by: David Goulet --- src/app/config/fallback_dirs.inc |

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-27 Thread nickm
commit 97d0cb83ed096fea9917237d68fe7700fe9ed206 Merge: 6354b70e49 c0bc30b6f0 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-07-27 Thread nickm
commit 97d0cb83ed096fea9917237d68fe7700fe9ed206 Merge: 6354b70e49 c0bc30b6f0 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

[tor-commits] [tor/maint-0.3.5] fallbackdir: Remove all three Digitalcourage3 relays

2020-07-27 Thread nickm
commit 564a9a54a14521ef59275fbb442f92fe385cccea Author: David Goulet Date: Fri Jul 24 14:56:05 2020 -0400 fallbackdir: Remove all three Digitalcourage3 relays They are about to be shutdown in September. Signed-off-by: David Goulet --- src/app/config/fallback_dirs.inc |

[tor-commits] [tpo/staging] Remove .htacces-membership

2020-07-27 Thread hiro
commit 323d5aa1e9b0e3d4b2e22a86571ffcc5302b19b3 Author: hiro Date: Mon Jul 27 18:52:19 2020 +0200 Remove .htacces-membership --- .htaccess-membership | 4 1 file changed, 4 deletions(-) diff --git a/.htaccess-membership b/.htaccess-membership deleted file mode 100644 index

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-07-27 Thread translation
commit 0005017e65b43f44da7db3067ed9d7f39e8e6637 Author: Translation commit bot Date: Mon Jul 27 16:46:27 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar.po b/ar.po index

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-07-27 Thread translation
commit 9c4dd66642868d83235c6e44a59f70c86757314e Author: Translation commit bot Date: Mon Jul 27 16:45:46 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ar.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ar.po b/ar.po

[tor-commits] [tpo/staging] Fix .htaccess-membership

2020-07-27 Thread hiro
commit 84f1011ca792d76ff099f9fc53335f5ff09969e7 Author: hiro Date: Mon Jul 27 18:38:52 2020 +0200 Fix .htaccess-membership --- .htaccess-membership | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.htaccess-membership b/.htaccess-membership index

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-07-27 Thread translation
commit d8efb06e4f9c9022bfba445cf96ed4cd580e226e Author: Translation commit bot Date: Mon Jul 27 16:16:28 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar.po b/ar.po

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-07-27 Thread translation
commit 7db9dd4d7c3199deb5525b54e90cb3c5172b07c7 Author: Translation commit bot Date: Mon Jul 27 16:15:51 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar.po b/ar.po index

[tor-commits] [tpo/staging] Add .htaccess-membership to add http auth to /about/membership

2020-07-27 Thread hiro
commit 7adf1323c117fd07c2a87523dc0c6fd9decb6461 Author: hiro Date: Mon Jul 27 18:11:07 2020 +0200 Add .htaccess-membership to add http auth to /about/membership --- .htaccess-membership | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess-membership b/.htaccess-membership index

[tor-commits] [torspec/master] update indices

2020-07-27 Thread nickm
commit 231c26ef2a15ea99f9dfa23a61cb410478a454d9 Author: Nick Mathewson Date: Mon Jul 27 11:42:44 2020 -0400 update indices --- proposals/000-index.txt | 16 proposals/BY_INDEX.md | 8 proposals/README.md | 8 3 files changed, 16 insertions(+), 16

[tor-commits] [torspec/master] Promote my proposals 323 and 325 to OPEN.

2020-07-27 Thread nickm
commit 772f6f7c09c454e7a7ad75a8d22785aceee40c34 Author: Nick Mathewson Date: Mon Jul 27 11:29:59 2020 -0400 Promote my proposals 323 and 325 to OPEN. --- proposals/323-walking-onions-full.md | 2 +- proposals/325-packed-relay-cells.md | 2 +- 2 files changed, 2 insertions(+), 2

[tor-commits] [torspec/master] Proposal 249 is superseded.

2020-07-27 Thread nickm
commit b7eba5ad550cc4e7d53f34e1e662af1d5b0a Author: Nick Mathewson Date: Mon Jul 27 11:28:05 2020 -0400 Proposal 249 is superseded. --- proposals/249-large-create-cells.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proposals/249-large-create-cells.txt

[tor-commits] [torspec/master] proposal 320 is rejected

2020-07-27 Thread nickm
commit ff2b6dc1cd0eacd95d4164562296559fdfe59266 Author: Nick Mathewson Date: Mon Jul 27 11:28:55 2020 -0400 proposal 320 is rejected --- proposals/320-tap-out-again.md | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/proposals/320-tap-out-again.md

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-07-27 Thread translation
commit e6a602e25a16404ac0f69366f05f759f725d57a8 Author: Translation commit bot Date: Mon Jul 27 15:15:56 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- nl.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nl.po b/nl.po index

[tor-commits] [tpo/master] Merge branch 'master' into 'master'

2020-07-27 Thread hiro
commit 992048474405c20504f8528bdd93bdb39568caae Merge: 45325bd0 647c3f8d Author: Antonela Date: Mon Jul 27 13:51:28 2020 + Merge branch 'master' into 'master' Rebase master See merge request antonela/tpo!2 assets/static/images/membership/green.png | Bin 0

[tor-commits] [tpo/master] Update members

2020-07-27 Thread hiro
commit cfd88badb0f3f7784870c558bb923741d5c35e23 Author: antonela Date: Mon Jul 27 11:02:57 2020 -0300 Update members --- assets/static/images/membership/logos/MullvadVPN.png | Bin 0 -> 21976 bytes templates/membership.html| 11 +-- 2 files changed, 5

[tor-commits] [torspec/master] Write a README.md for torspec.

2020-07-27 Thread nickm
commit 77ecc21b1265697a33617bc4c64f6748454913d3 Author: Nick Mathewson Date: Mon Jul 27 09:38:54 2020 -0400 Write a README.md for torspec. --- README.md | 69 +++ 1 file changed, 69 insertions(+) diff --git a/README.md

[tor-commits] [torspec/master] Update reindex script to generate nice markdown.

2020-07-27 Thread nickm
commit 1fa2a98dac5b19a8139a4b1345731c61e69d Author: Nick Mathewson Date: Mon Jul 27 10:38:37 2020 -0400 Update reindex script to generate nice markdown. --- proposals/reindex.py | 77 1 file changed, 66 insertions(+), 11

[tor-commits] [torspec/master] reindex.py: drop python2 support.

2020-07-27 Thread nickm
commit ea85e63de494d5ad18b587ded43f6fa437d4873c Author: Nick Mathewson Date: Mon Jul 27 10:18:21 2020 -0400 reindex.py: drop python2 support. --- proposals/reindex.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proposals/reindex.py b/proposals/reindex.py

[tor-commits] [torspec/master] Move tor-fw-helper-spec.txt to attic. This feature is no longer supported.

2020-07-27 Thread nickm
commit a872fc67b425470d0b0a09790dd6a376e4b0515a Author: Nick Mathewson Date: Mon Jul 27 09:56:29 2020 -0400 Move tor-fw-helper-spec.txt to attic. This feature is no longer supported. --- tor-fw-helper-spec.txt => attic/tor-fw-helper-spec.txt | 0 1 file changed, 0 insertions(+), 0

[tor-commits] [torspec/master] Change index file name so it doesn't override readme.

2020-07-27 Thread nickm
commit 4c7124a311d6b7930d527a4379f09873b93993ba Author: Nick Mathewson Date: Mon Jul 27 10:43:34 2020 -0400 Change index file name so it doesn't override readme. --- proposals/{INDEX.md => BY_INDEX.md} | 0 proposals/{INDEX_template.md => BY_INDEX_template.md} | 0

[tor-commits] [torspec/master] Small template and script improvements

2020-07-27 Thread nickm
commit 246a5864619e2393d447aab5826a990fdef3dfd5 Author: Nick Mathewson Date: Mon Jul 27 10:49:51 2020 -0400 Small template and script improvements --- proposals/BY_INDEX.md | 10 -- proposals/BY_INDEX_template.md | 10 -- proposals/README.md| 35

[tor-commits] [torspec/master] Add nice markdown to proposals directory.

2020-07-27 Thread nickm
commit 017789403188b1e44ac1425be5b5f386bd1b226e Author: Nick Mathewson Date: Mon Jul 27 10:38:57 2020 -0400 Add nice markdown to proposals directory. --- proposals/INDEX.md | 240 ++ proposals/README.md | 330

[tor-commits] [torspec/master] Add a pair of templates for markdown proposal indices

2020-07-27 Thread nickm
commit 3395172250079bd0c9f20936037b3f9c2c23cc4d Author: Nick Mathewson Date: Mon Jul 27 10:14:24 2020 -0400 Add a pair of templates for markdown proposal indices --- proposals/INDEX_template.md | 10 + proposals/README_template.md | 99 2

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2020-07-27 Thread translation
commit 234bc6f30f4a0663d71cb9b64618cffd06b22773 Author: Translation commit bot Date: Mon Jul 27 14:46:33 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl.po b/nl.po

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2020-07-27 Thread translation
commit 6438eac4597f8931d4622bc673849e39bcefdc48 Author: Translation commit bot Date: Mon Jul 27 14:45:49 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- nl.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nl.po b/nl.po index

[tor-commits] [tpo/staging] Update members

2020-07-27 Thread hiro
commit cfd88badb0f3f7784870c558bb923741d5c35e23 Author: antonela Date: Mon Jul 27 11:02:57 2020 -0300 Update members --- assets/static/images/membership/logos/MullvadVPN.png | Bin 0 -> 21976 bytes templates/membership.html| 11 +-- 2 files changed, 5

[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto-gl/master' into staging

2020-07-27 Thread hiro
commit 45cedd844b4a20df037521a6d9cd9eb17430c5c1 Merge: 1b2a2910 cfd88bad Author: hiro Date: Mon Jul 27 16:18:59 2020 +0200 Merge remote-tracking branch 'anto-gl/master' into staging assets/static/images/membership/logos/MullvadVPN.png | Bin 0 -> 21976 bytes templates/membership.html

[tor-commits] [tpo/staging] Merge branch 'master' into 'master'

2020-07-27 Thread hiro
commit 992048474405c20504f8528bdd93bdb39568caae Merge: 45325bd0 647c3f8d Author: Antonela Date: Mon Jul 27 13:51:28 2020 + Merge branch 'master' into 'master' Rebase master See merge request antonela/tpo!2 assets/static/images/membership/green.png | Bin 0

[tor-commits] [tpo/staging] Removed l10n tags from the template. It is not needed now.

2020-07-27 Thread hiro
commit 694f44c5cdb02eb29a32d4dacd550e7d830114cd Author: antonela Date: Fri Jul 24 12:06:41 2020 -0300 Removed l10n tags from the template. It is not needed now. --- templates/membership.html | 37 ++--- 1 file changed, 18 insertions(+), 19 deletions(-)

[tor-commits] [tpo/staging] Add .htaccess for /about/membership

2020-07-27 Thread hiro
commit 1b2a2910470b6fb1039a29a275e8d6b6f87ad301 Author: hiro Date: Mon Jul 27 16:02:54 2020 +0200 Add .htaccess for /about/membership --- .htaccess-membership | 4 1 file changed, 4 insertions(+) diff --git a/.htaccess-membership b/.htaccess-membership new file mode 100644 index

[tor-commits] [tpo/staging] Improve Shallot view

2020-07-27 Thread hiro
commit e516b476ba403ed7d1b8d716330028300b32a7c2 Author: antonela Date: Fri Jul 24 13:39:43 2020 -0300 Improve Shallot view --- .../static/images/membership/logos/MullvadVPN.svg | 225 - templates/membership.html | 18 +- 2 files changed, 176

[tor-commits] [tpo/staging] - Add Members

2020-07-27 Thread hiro
commit c4da4e58b959f73e054bf2240433e1f146062d36 Author: antonela Date: Fri Jul 24 13:35:59 2020 -0300 - Add Members - Add anchor links --- assets/static/images/membership/logos/Avast.png| Bin 0 -> 78009 bytes .../static/images/membership/logos/MullvadVPN.svg | 78

[tor-commits] [tpo/staging] Make text visible with background

2020-07-27 Thread hiro
commit fdcce1809b17c184eac2fd58b58bda841f8699bf Author: antonela Date: Fri Jul 24 13:37:22 2020 -0300 Make text visible with background --- templates/membership.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/membership.html

[tor-commits] [tpo/staging] Revert "Unbreak alpha builds, too"

2020-07-27 Thread hiro
commit fe4481dfd2e87f095aeee4f8912753fc318582d3 Author: Matthew Finkel Date: Mon Jul 27 02:08:51 2020 + Revert "Unbreak alpha builds, too" This reverts commit 7b192493f98eb3a5e79c26039073ff89f3231796. --- templates/macros/downloads.html | 6 +++--- 1 file changed, 3

[tor-commits] [tpo/staging] Update contents.lr

2020-07-27 Thread hiro
commit 9cf593db0f42ea1c78baf9c5a47e48394378306f Author: antonela Date: Fri Jul 24 12:12:33 2020 -0300 Update contents.lr --- content/about/membership/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/membership/contents.lr

[tor-commits] [tpo/staging] Fix images url

2020-07-27 Thread hiro
commit 78300c166856da114ccfbd994e549fc9df70c6af Author: antonela Date: Fri Jul 24 12:26:45 2020 -0300 Fix images url --- templates/membership.html | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index

[tor-commits] [tpo/staging] Unbreak alpha builds, too

2020-07-27 Thread hiro
commit 7b192493f98eb3a5e79c26039073ff89f3231796 Author: Matthew Finkel Date: Sun Jul 26 20:37:27 2020 + Unbreak alpha builds, too --- templates/macros/downloads.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/macros/downloads.html

[tor-commits] [tpo/staging] Point Tor Browser downloads at archive.tpo

2020-07-27 Thread hiro
commit ea8e9945f47613c43bdea3579c053024c39fda34 Author: Matthew Finkel Date: Sun Jul 26 19:32:23 2020 + Point Tor Browser downloads at archive.tpo We're in the process of unbreaking it, but it'll take some time. --- lego | 2 +-

  1   2   >