March 2015 - tor-commits - lists.torproject.org

[tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit bb8c4e69ca5c8bcad7d66b2ad502ab35b1a5032b Merge: 5ebe7f2 dfd6cf9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 24 10:23:44 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.6] bump to 0.2.6.6
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit dfd6cf9ea2b3f84e868c71af909c26358db07dac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 24 10:23:34 2015 -0400 bump to 0.2.6.6 --- 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 3adcc2b..e575881 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.5-rc-dev]) +AC_INIT([tor],[0.2.6.6]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3eb287f..dda8244 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.2.6.5-rc-dev" +!define VERSION "0.2.6.6" !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 608ae35..9b2a9b0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.5-rc-dev" +#define VERSION "0.2.6.6"

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Mar '15

24 Mar '15

commit fedb10797eb1202585db869c4bfc6190b59600b7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 24 14:15:47 2015 +0000 Update translations for torbutton-torbuttonproperties --- fr_CA/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr_CA/torbutton.properties b/fr_CA/torbutton.properties index 047d38f..cb4055c 100644 --- a/fr_CA/torbutton.properties +++ b/fr_CA/torbutton.properties @@ -55,8 +55,8 @@ torbutton.popup.confirm_plugins = Les plugiciels tels que Flash peuvent nuire à torbutton.popup.never_ask_again = Ne plus me le demander. torbutton.popup.confirm_newnym = Le navigateur Tor fermera toutes les fenêtres et onglets. Toutes les sessions des sites Web seront perdues.\n\nRedémarrer le navigateur Tor maintenant pour réinitialiser votre identité?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Le menu oignon vert propose maintenant un curseur de sécurité afin d'ajuster votre niveau de sécurité. Essayez-le ! +torbutton.slider_notification_button = Ouvrir les paramètres de sécurité # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Ce site Web (%S) a essayé d'extraire des données d'image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe navigateur Tor devrait-il permettre à ce site Web d'extraire des données d'image de canevas HTML5?

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Mar '15

24 Mar '15

commit d66c30ebc4289fcb98b387b8dc9181f964c1ca8f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 24 13:45:44 2015 +0000 Update translations for torbutton-torbuttonproperties --- zh_CN/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties index 16fba95..fa3ab6a 100644 --- a/zh_CN/torbutton.properties +++ b/zh_CN/torbutton.properties @@ -55,8 +55,8 @@ torbutton.popup.confirm_plugins = Flash 之类的插件可对用户的隐私与 torbutton.popup.never_ask_again = 不再询问 torbutton.popup.confirm_newnym = Tor Browser 将关闭所有窗口和标签页。所有网站登录状态都将丢失。\n\n重新启动 Tor Browser 以重置您的身份？\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = 绿色的洋葱菜单中现在有了一个安全滑块，您可以用它来调整您的安全级别。试试吧！ +torbutton.slider_notification_button = 打开安全设置 # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=此网站 (%S) 试图获取 HTML5 Canva 图像数据，该数据可用作你所用计算机的唯一标识。\n\nTor Browser 是否应允许此网站获取 HTML5 Canva 图像数据？

1 0

[tor/master] Remove changes files for patches in 0.2.6.6 or earlier.
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 60d147fb9e8bcf998c75e9f7f988fce525780163 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 24 09:38:46 2015 -0400 Remove changes files for patches in 0.2.6.6 or earlier. --- changes/bug15240 | 6 ------ changes/bug15245 | 5 ----- changes/bug15436 | 4 ---- changes/bug9495_redux | 4 ---- changes/ticket15176 | 3 --- changes/ticket15212 | 6 ------ 6 files changed, 28 deletions(-) diff --git a/changes/bug15240 b/changes/bug15240 deleted file mode 100644 index e11f804..0000000 --- a/changes/bug15240 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (pluggable transports): - - Initialize the extended OR Port authentication cookie before launching - pluggable transports. This prevents a race condition that occured when - server-side pluggable transports would cache the authentication cookie - before it has been (re)generated. Fixes bug 15240; bugfix on - 0.2.5.1-alpha. diff --git a/changes/bug15245 b/changes/bug15245 deleted file mode 100644 index 520a370..0000000 --- a/changes/bug15245 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Avoid crashing when making certain configuration option changes - on clients. Fixes bug 15245; bugfix on 0.2.6.3-alpha. Reported - by "anonym". - diff --git a/changes/bug15436 b/changes/bug15436 deleted file mode 100644 index 4fa44d1..0000000 --- a/changes/bug15436 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (portability): - - Use the correct datatype in the SipHash-2-4 function to prevent compilers - from assuming any sort of alignment. Fixes bug 15436; bugfix on - 0.2.5.3-alpha. diff --git a/changes/bug9495_redux b/changes/bug9495_redux deleted file mode 100644 index 74b0cdf..0000000 --- a/changes/bug9495_redux +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (portability): - - Do not crash on startup when running on Solaris. Fixes a bug - related to our fix for 9495; bugfix on 0.2.6.1-alpha. Reported - by "ruebezahl". diff --git a/changes/ticket15176 b/changes/ticket15176 deleted file mode 100644 index 6d12723..0000000 --- a/changes/ticket15176 +++ /dev/null @@ -1,3 +0,0 @@ - o Code simplification and refactoring: - - Refactor main loop to extract the 'loop' part. This makes it easier - to run Tor under Shadow. Closes ticket 15176. diff --git a/changes/ticket15212 b/changes/ticket15212 deleted file mode 100644 index 2c41e38..0000000 --- a/changes/ticket15212 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor features (heartbeat): - - - On relays, report how many connections we negotiated using each - version of the Tor link protocols. This information will let us - know if removing support for very old versions of the Tor - protocols is harming the network. Closes ticket 15212.

1 0

[tor/release-0.2.6] Fix unaligned access in SipHash-2-4.
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 732f522a42702494c4029da568a2603bb963e402 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sun Mar 22 22:31:08 2015 +0000 Fix unaligned access in SipHash-2-4. The compiler is allowed to assume that a "uint64_t *" is aligned correctly, and will inline a version of memcpy that acts as such. Use "uint8_t *", so the compiler does the right thing. --- changes/bug15436 | 4 ++++ src/ext/csiphash.c | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/changes/bug15436 b/changes/bug15436 new file mode 100644 index 0000000..4fa44d1 --- /dev/null +++ b/changes/bug15436 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Use the correct datatype in the SipHash-2-4 function to prevent compilers + from assuming any sort of alignment. Fixes bug 15436; bugfix on + 0.2.5.3-alpha. diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index c247886..979990f 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -100,10 +100,18 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k uint64_t k0 = key->k0; uint64_t k1 = key->k1; uint64_t b = (uint64_t)src_sz << 56; +#ifdef UNALIGNED_OK const uint64_t *in = (uint64_t*)src; +#else + /* On platforms where alignment matters, if 'in' is a pointer to a + * datatype that must be aligned, the compiler is allowed to + * generate code that assumes that it is aligned as such. + */ + const uint8_t *in = (uint8_t *)src; +#endif - uint64_t t; - uint8_t *pt, *m; + uint64_t t; + uint8_t *pt, *m; uint64_t v0 = k0 ^ 0x736f6d6570736575ULL; uint64_t v1 = k1 ^ 0x646f72616e646f6dULL; @@ -113,12 +121,14 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k while (src_sz >= 8) { #ifdef UNALIGNED_OK uint64_t mi = _le64toh(*in); + in += 1; #else uint64_t mi; memcpy(&mi, in, 8); mi = _le64toh(mi); + in += 8; #endif - in += 1; src_sz -= 8; + src_sz -= 8; v3 ^= mi; DOUBLE_ROUND(v0,v1,v2,v3); v0 ^= mi;

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit c113544a94686f533c6654795429b3384d509579 Merge: ca03b10 732f522 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 23 09:25:15 2015 -0400 Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6 changes/bug15436 | 4 ++++ src/ext/csiphash.c | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 3eff8f38a5c2c3b65716cee7cda09a7458c94d7f Merge: 97ca025 c113544 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 24 09:34:39 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6 changes/bug15436 | 4 ++++ src/ext/csiphash.c | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.6] Start 0.2.6.6 changelog; fold in the one entry.
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 6ce1a821323f4a51b5622e64b55bf4837d348d53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 24 09:37:36 2015 -0400 Start 0.2.6.6 changelog; fold in the one entry. --- ChangeLog | 18 ++++++++++++++++++ ReleaseNotes | 18 ++++++++++-------- changes/bug15436 | 4 ---- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index de97d6c..27e1616 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Changes in version 0.2.6.6 - 2015-0?-?? + Tor 0.2.6.6 is the first stable release in the 0.2.6 series. + + It adds numerous safety, security, correctness, and performance + improvements. Client programs can be configured to use more kinds of + sockets, AutomapHosts works better, the multithreading backend is + improved, cell transmission is refactored, test coverage is much + higher, more denial-of-service attacks are handled, guard selection is + improved to handle long-term guards better, pluggable transports + should work a bit better, and some annoying hidden service performance + bugs should be addressed. + + o Minor bugfixes (portability): + - Use the correct datatype in the SipHash-2-4 function to prevent + compilers from assuming any sort of alignment. Fixes bug 15436; + bugfix on 0.2.5.3-alpha. + + Changes in version 0.2.6.5-rc - 2015-03-18 Tor 0.2.6.5-rc is the second and (hopefully) last release candidate in the 0.2.6. It fixes a small number of bugs found in 0.2.6.4-rc. diff --git a/ReleaseNotes b/ReleaseNotes index 403303e..1a3fb01 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -5,17 +5,16 @@ each development snapshot, see the ChangeLog file. Changes in version 0.2.6.6 - 2015-0?-?? - Tor 0.2.6.6 is the first stable release in the 0.2.6 series. It adds numerous safety, security, correctness, and performance - improvements. Client programs can be configured to use more kinds - of sockets, AutomapHosts works better, the multithreading backend - is improved, cell transmission is refactored, test coverage is - much higher, more denial-of-service attacks are handled, guard - selection is improved to handle long-term guards better, pluggable - transports should work a bit better, and some annoying hidden - service performance bugs should be addressed. + improvements. Client programs can be configured to use more kinds of + sockets, AutomapHosts works better, the multithreading backend is + improved, cell transmission is refactored, test coverage is much + higher, more denial-of-service attacks are handled, guard selection is + improved to handle long-term guards better, pluggable transports + should work a bit better, and some annoying hidden service performance + bugs should be addressed. o New compiler and system requirements: - Tor 0.2.6.x requires that your compiler support more of the C99 @@ -676,6 +675,9 @@ Changes in version 0.2.6.6 - 2015-0?-?? - Fix the ioctl()-based network interface lookup code so that it will work on systems that have variable-length struct ifreq, for example Mac OS X. + - Use the correct datatype in the SipHash-2-4 function to prevent + compilers from assuming any sort of alignment. Fixes bug 15436; + bugfix on 0.2.5.3-alpha. o Minor bugfixes (preventative security, C safety): - When reading a hexadecimal, base-32, or base-64 encoded value from diff --git a/changes/bug15436 b/changes/bug15436 deleted file mode 100644 index 4fa44d1..0000000 --- a/changes/bug15436 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (portability): - - Use the correct datatype in the SipHash-2-4 function to prevent compilers - from assuming any sort of alignment. Fixes bug 15436; bugfix on - 0.2.5.3-alpha.

1 0

[tor/release-0.2.6] Fold stuff into 0.2.6 releasenotes and add a blurb
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 97ca0257e1a383aa5621f23b15671f8e32769d76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 24 09:34:30 2015 -0400 Fold stuff into 0.2.6 releasenotes and add a blurb --- ReleaseNotes | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index 06cc09c..403303e 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -4,9 +4,18 @@ of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. -Changes in version 0.2.6.??? +Changes in version 0.2.6.6 - 2015-0?-?? - Write a blurb here. + Tor 0.2.6.6 is the first stable release in the 0.2.6 series. + + It adds numerous safety, security, correctness, and performance + improvements. Client programs can be configured to use more kinds + of sockets, AutomapHosts works better, the multithreading backend + is improved, cell transmission is refactored, test coverage is + much higher, more denial-of-service attacks are handled, guard + selection is improved to handle long-term guards better, pluggable + transports should work a bit better, and some annoying hidden + service performance bugs should be addressed. o New compiler and system requirements: - Tor 0.2.6.x requires that your compiler support more of the C99 @@ -201,6 +210,13 @@ Changes in version 0.2.6.??? circuits through that guard. Fixes bug 9819; bugfix on 0.2.1.1-alpha. Reported by "skruffy". + o Major bugfixes (pluggable transports): + - Initialize the extended OR Port authentication cookie before + launching pluggable transports. This prevents a race condition + that occured when server-side pluggable transports would cache the + authentication cookie before it has been (re)generated. Fixes bug + 15240; bugfix on 0.2.5.1-alpha. + o Major bugfixes (relay, stability, possible security): - Fix a bug that could lead to a relay crashing with an assertion failure if a buffer of exactly the wrong layout is passed to @@ -276,6 +292,12 @@ Changes in version 0.2.6.??? minutes to 30 seconds (or from one hour to 10 minutes if AvoidDiskWrites is set). Closes ticket 12485. + o Minor features (heartbeat): + - On relays, report how many connections we negotiated using each + version of the Tor link protocols. This information will let us + know if removing support for very old versions of the Tor + protocols is harming the network. Closes ticket 15212. + o Minor features (hidden service): - Make Sybil attacks against hidden services harder by changing the minimum time required to get the HSDir flag from 25 hours up to 96 @@ -814,8 +836,8 @@ Changes in version 0.2.6.??? ticket 14202. - Remove a test for a long-defunct broken version-one directory server. - - o Code simplification and refactoring: + - Refactor main loop to extract the 'loop' part. This makes it + easier to run Tor under Shadow. Closes ticket 15176. - Stop using can_complete_circuits as a global variable; access it with a function instead. - Avoid using operators directly as macro arguments: this lets us

1 0