October 2017 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit c4804bb280f16a484d9d5d1ed4aae8bc1614cfce Merge: a0f8c0100 fb8852719 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 08:59:19 2017 -0400 Merge branch 'maint-0.3.2' "ours" to avoid version bump

1 0

[tor/release-0.3.2] update to 0.3.2.3-alpha
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit fb885271954b4dd5578ad0849a000ab654a5bb78 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 08:59:07 2017 -0400 update to 0.3.2.3-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 668fd4f1f..ca2e803ea 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.2.2-alpha-dev]) +AC_INIT([tor],[0.3.2.3-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 02d4ef907..ef35b312a 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.3.2.2-alpha-dev" +!define VERSION "0.3.2.3-alpha" !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 6c3000a71..6d3f9fd1c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.2.2-alpha-dev" +#define VERSION "0.3.2.3-alpha"

1 0

[webwml/master] Fix typo in htaccess
by hiro＠torproject.org 27 Oct '17

27 Oct '17

commit 58fc9a9a7ee63f3533ba637a0812a96c0a20c79b Author: hiromipaw <hiro(a)torproject.org> Date: Fri Oct 27 14:30:32 2017 +0200 Fix typo in htaccess --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index dc40727d..557fbbf0 100644 --- a/.htaccess +++ b/.htaccess @@ -48,7 +48,7 @@ RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] RewriteRule ^support(.*) https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Suppo… [R=301,L] # Newsletter -RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=3-1,L] +RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L] # other (feel free to categorize) RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]

1 0

[metrics-web/master] Increase right margin on graphs.
by karsten＠torproject.org 27 Oct '17

27 Oct '17

commit 9470e4b70e7ec2285fbb56939388503171517307 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 27 14:20:09 2017 +0200 Increase right margin on graphs. The goal is to avoid cutting off axis labels in some edge cases. --- website/rserve/graphs.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index 149ddd5..62cc028 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -273,7 +273,8 @@ formatter <- function(x, ...) { format(x, ..., scientific = FALSE, big.mark = ' ') } -theme_update(plot.title = element_text(hjust = 0.5)) +theme_update(plot.title = element_text(hjust = 0.5), + plot.margin = margin(5.5, 11, 5.5, 5.5)) plot_networksize <- function(start, end, path) { end <- min(end, as.character(Sys.Date() - 2))

1 0

[webwml/master] Add redirect to support wiki
by hiro＠torproject.org 27 Oct '17

27 Oct '17

commit ee25281d25dec4fad5c2238b007e49a3965676ec Author: hiromipaw <hiro(a)torproject.org> Date: Fri Oct 27 14:01:43 2017 +0200 Add redirect to support wiki --- .htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.htaccess b/.htaccess index 2e47ae78..616c08d1 100644 --- a/.htaccess +++ b/.htaccess @@ -44,6 +44,9 @@ RewriteRule ^tshirt(.*) /getinvolved/tshirt$1 [R=301,L] RewriteRule ^research(.*) https://research.torproject.org/ [R=301,L] RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] +# Support +RewriteRule ^support(.*) https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Suppo… [R=301,L] + # other (feel free to categorize) RewriteRule ^people(.*) /about/corepeople$1 [R=301,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L]

1 0

[webwml/master] Add redirect to newsletter
by hiro＠torproject.org 27 Oct '17

27 Oct '17

commit 921f3a271cc9f7816c19d3dc59399cf68096a872 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Oct 27 14:02:04 2017 +0200 Add redirect to newsletter --- .htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.htaccess b/.htaccess index 616c08d1..dc40727d 100644 --- a/.htaccess +++ b/.htaccess @@ -47,6 +47,9 @@ RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] # Support RewriteRule ^support(.*) https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Suppo… [R=301,L] +# Newsletter +RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=3-1,L] + # other (feel free to categorize) RewriteRule ^people(.*) /about/corepeople$1 [R=301,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L]

1 0

[webwml/master] Add newsletter link to nav
by hiro＠torproject.org 27 Oct '17

27 Oct '17

commit 8f5328eb4c99d1221664a1bb611d729472418f93 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Oct 27 14:20:32 2017 +0200 Add newsletter link to nav --- en/navigation.wmi | 1 + include/#navigation.wmi# | 29 +++++++++++++++++++++++++++++ include/.#navigation.wmi | 1 + include/links.wmi | 1 + press/en/sidenav.wmi | 3 +++ 5 files changed, 35 insertions(+) diff --git a/en/navigation.wmi b/en/navigation.wmi index 504f29df..051a263e 100644 --- a/en/navigation.wmi +++ b/en/navigation.wmi @@ -12,6 +12,7 @@ 'docs/documentation' , 'Documentation', 'press/press' , 'Press', '<blog>' , 'Blog', + '<newsletter>' , 'Newsletter', 'about/contact' , 'Contact', ); my @donatenav = ( diff --git a/include/#navigation.wmi# b/include/#navigation.wmi# new file mode 100644 index 00000000..456b4f04 --- /dev/null +++ b/include/#navigation.wmi# @@ -0,0 +1,29 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 22069 $ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'docs/documentation' , 'Documentation', + 'press/press' , 'Press', + '<blog>' , 'Blog', + '<newsletter>' , 'Newsletter', + 'about/contact' , 'Contact', + ); + my @donatenav = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'about/contact' , 'Contact', + ); + my @calltoaction = ( + 'download/download-easy' , 'Download', + 'getinvolved/volunteer' , 'Get Involved', + 'donate/donate-button' , 'Donate', + ); + +:> diff --git a/include/.#navigation.wmi b/include/.#navigation.wmi new file mode 120000 index 00000000..de260ad0 --- /dev/null +++ b/include/.#navigation.wmi @@ -0,0 +1 @@ +hiro@coruscant.9885:1509102593 \ No newline at end of file diff --git a/include/links.wmi b/include/links.wmi index b7787dbb..afbc6991 100644 --- a/include/links.wmi +++ b/include/links.wmi @@ -9,6 +9,7 @@ <define-tag wiki whitespace=delete>https://trac.torproject.org/projects/tor/wiki/</define-tag> <define-tag wikifaq whitespace=delete>https://trac.torproject.org/projects/tor/wiki/doc/TorFAQ</define-tag> <define-tag blog whitespace=delete>https://blog.torproject.org/blog/</define-tag> +<define-tag newsletter whitespace=delete>https://newsletter.torproject.org</define-tag> <define-tag tbbrepo whitespace=delete>https://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:</define-tag> <define-tag specblob whitespace=delete>https://gitweb.torproject.org/torspec.git/tree/</define-tag> <define-tag spectree whitespace=delete>https://gitweb.torproject.org/torspec.git?a=tree;hb=HEAD;f=</define-tag> diff --git a/press/en/sidenav.wmi b/press/en/sidenav.wmi index f33d071e..fc89875f 100644 --- a/press/en/sidenav.wmi +++ b/press/en/sidenav.wmi @@ -22,6 +22,9 @@ {'url' => 'press/press', 'txt' => 'Tor Media and Press', }, + {'url' => 'https://newsletter.torproject.org/', + 'txt' => 'Tor Newsletter', + }, {'url' => 'https://blog.torproject.org/', 'txt' => 'Tor Blog', },

1 0

[tor/maint-0.3.2] hs-v3: Check the ed25519 key when picking intro point
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit e598c6f6dee3696df1d0c228268a1bf1b369eb86 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 26 14:54:20 2017 -0400 hs-v3: Check the ed25519 key when picking intro point If the intro point supports ed25519 link authentication, make sure we don't have a zeroed key which would lead to a failure to extend to it. We already check for an empty key if the intro point does not support it so this makes the check on the key more consistent and symmetric. Fixes #24002 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24002 | 5 +++++ src/or/hs_service.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/changes/bug24002 b/changes/bug24002 new file mode 100644 index 000000000..cdb608111 --- /dev/null +++ b/changes/bug24002 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden service): + - Make sure that we have a usable ed25519 key when the intro point relay + does support ed25519 link authentication. We do check for an empty key + when the relay does not support it so this makes it nice and symmetric. + Fixes bug 24002; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 3d1945aa9..4b67bb4d4 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1564,6 +1564,10 @@ pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes) * protocol */ if (!node_supports_ed25519_link_authentication(node)) { tor_assert_nonfatal(ed25519_public_key_is_zero(&info->ed_identity)); + } else { + /* Make sure we *do* have an ed key if we support the link authentication. + * Sending an empty key would result in a failure to extend. */ + tor_assert_nonfatal(!ed25519_public_key_is_zero(&info->ed_identity)); } /* Create our objects and populate them with the node information. */

1 0

[tor/master] hs-v3: Check the ed25519 key when picking intro point
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit e598c6f6dee3696df1d0c228268a1bf1b369eb86 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 26 14:54:20 2017 -0400 hs-v3: Check the ed25519 key when picking intro point If the intro point supports ed25519 link authentication, make sure we don't have a zeroed key which would lead to a failure to extend to it. We already check for an empty key if the intro point does not support it so this makes the check on the key more consistent and symmetric. Fixes #24002 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24002 | 5 +++++ src/or/hs_service.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/changes/bug24002 b/changes/bug24002 new file mode 100644 index 000000000..cdb608111 --- /dev/null +++ b/changes/bug24002 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden service): + - Make sure that we have a usable ed25519 key when the intro point relay + does support ed25519 link authentication. We do check for an empty key + when the relay does not support it so this makes it nice and symmetric. + Fixes bug 24002; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 3d1945aa9..4b67bb4d4 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1564,6 +1564,10 @@ pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes) * protocol */ if (!node_supports_ed25519_link_authentication(node)) { tor_assert_nonfatal(ed25519_public_key_is_zero(&info->ed_identity)); + } else { + /* Make sure we *do* have an ed key if we support the link authentication. + * Sending an empty key would result in a failure to extend. */ + tor_assert_nonfatal(!ed25519_public_key_is_zero(&info->ed_identity)); } /* Create our objects and populate them with the node information. */

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit a0f8c010049f8d0fee375041948287cd65bef12a Merge: 4af1653e0 e598c6f6d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 08:05:04 2017 -0400 Merge branch 'maint-0.3.2' changes/bug24002 | 5 +++++ src/or/hs_service.c | 4 ++++ 2 files changed, 9 insertions(+)

1 0