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

[tor/release-0.2.6] Start a changelog for 0.2.6.8
by nickm＠torproject.org 19 May '15

19 May '15

commit e1366d907a81796ad985dc5d50c533e24c26528a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 14:41:12 2015 -0400 Start a changelog for 0.2.6.8 --- ChangeLog | 21 +++++++++++++++++++++ changes/bug15823 | 4 ---- changes/bug15850 | 4 ---- changes/geoip-april2015 | 3 --- changes/geoip6-april2015 | 2 -- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9af97c8..d5eab7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Changes in version 0.2.6.8 - 2015-05-2? + Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and + fixes an authority-side bug in assigning the HSDir flag. All directory + authorities should upgrade. + + o Major bugfixes (hidden services): + - Revert commit that made directory authorities assign the HSDir + flag to relay without a DirPort; this was bad because such relays + can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix + on tor-0.2.6.3-alpha. + + o Minor bugfixes (hidden service): + - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on + a client authorized hidden service. Fixes bug 15823; bugfix + on 0.2.1.6-alpha. + + o Minor features (geoip): + - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the April 8 2015 Maxmind GeoLite2 + Country database. + Changes in version 0.2.6.7 - 2015-04-06 Tor 0.2.6.7 fixes two security issues that could be used by an attacker to crash hidden services, or crash clients visiting hidden diff --git a/changes/bug15823 b/changes/bug15823 deleted file mode 100644 index 987de5d..0000000 --- a/changes/bug15823 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (hidden service): - - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells - on a client authorized hidden service. Fixes bug 15823; bugfix - on 0.2.1.6-alpha. diff --git a/changes/bug15850 b/changes/bug15850 deleted file mode 100644 index 48a7c7b..0000000 --- a/changes/bug15850 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfix - - Revert commit that made directory authority assign the HSDir flag to - relay without a DirPort which is bad because relay can't handle - BEGIN_DIR cells. Fixes #15850. Bugfix on tor-0.2.6.3-alpha; diff --git a/changes/geoip-april2015 b/changes/geoip-april2015 deleted file mode 100644 index 7db38ed..0000000 --- a/changes/geoip-april2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database. - diff --git a/changes/geoip6-april2015 b/changes/geoip6-april2015 deleted file mode 100644 index 241c911..0000000 --- a/changes/geoip6-april2015 +++ /dev/null @@ -1,2 +0,0 @@ - o Minor features: - - Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database.

1 0

[tor/release-0.2.6] Bump maint-0.2.6 to 0.2.6.8
by nickm＠torproject.org 19 May '15

19 May '15

commit b3a225fb13d57125888bc6e2c84bdca9abce00f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 14:48:09 2015 -0400 Bump maint-0.2.6 to 0.2.6.8 --- 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 cc271c8..81ef2c7 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.7-dev]) +AC_INIT([tor],[0.2.6.8]) 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 b8798d8..1764614 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.7-dev" +!define VERSION "0.2.6.8" !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 b014a12..c0ab2de 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.7-dev" +#define VERSION "0.2.6.8"

1 0

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

19 May '15

commit a45526c230d91e037438566287fd212fa4510480 Merge: e1366d9 b3a225f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 14:49:54 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in src/win32/orconfig.h configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --cc src/win32/orconfig.h index e9591e1,c0ab2de..466822e --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@@ -232,10 -232,10 +232,9 @@@ #define USING_TWOS_COMPLEMENT /* Version number of package */ - #define VERSION "0.2.6.7" - + #define VERSION "0.2.6.8" - #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR #define RSHIFT_DOES_SIGN_EXTEND

1 0

[stem/master] Support for NETWORK_LIVENESS events
by atagar＠torproject.org 19 May '15

19 May '15

commit a990a42a01a2e66739066138f029df0314ad8a8b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 19 08:41:42 2015 -0700 Support for NETWORK_LIVENESS events Adding support for tor's new event type... https://gitweb.torproject.org/torspec.git/commit/?id=44aac630f69fc1bc1ab8cd… https://trac.torproject.org/projects/tor/ticket/15358 --- docs/change_log.rst | 4 ++++ stem/control.py | 2 ++ stem/response/events.py | 17 +++++++++++++++++ stem/version.py | 2 ++ test/unit/response/events.py | 12 ++++++++++++ 5 files changed, 37 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index bbde6f5..1486391 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -42,6 +42,10 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. + * **Controller** + + * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) + .. _version_1.4: Version 1.4 (May 13th, 2015) diff --git a/stem/control.py b/stem/control.py index 657f559..a903e4d 100644 --- a/stem/control.py +++ b/stem/control.py @@ -197,6 +197,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo **HS_DESC** :class:`stem.response.events.HSDescEvent` **HS_DESC_CONTENT** :class:`stem.response.events.HSDescContentEvent` **INFO** :class:`stem.response.events.LogEvent` + **NETWORK_LIVENESS** :class:`stem.response.events.NetworkLivenessEvent` **NEWCONSENSUS** :class:`stem.response.events.NewConsensusEvent` **NEWDESC** :class:`stem.response.events.NewDescEvent` **NOTICE** :class:`stem.response.events.LogEvent` @@ -293,6 +294,7 @@ EventType = stem.util.enum.UppercaseEnum( 'HS_DESC', 'HS_DESC_CONTENT', 'INFO', + 'NETWORK_LIVENESS', 'NEWCONSENSUS', 'NEWDESC', 'NOTICE', diff --git a/stem/response/events.py b/stem/response/events.py index 9c38649..2ae01be 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -749,6 +749,22 @@ class NetworkStatusEvent(Event): )) +class NetworkLivenessEvent(Event): + """ + Event for when the network becomes reachable or unreachable. + + The NETWORK_LIVENESS event was introduced in tor version 0.2.7.2-alpha. + + .. versionadded:: 1.5.0 + + :var str status: status of the network ('UP', 'DOWN', or possibly other + statuses in the future) + """ + + _VERSION_ADDED = stem.version.Requirement.EVENT_NETWORK_LIVENESS + _POSITIONAL_ARGS = ('status',) + + class NewConsensusEvent(Event): """ Event for when we have a new consensus. This is similar to @@ -1311,6 +1327,7 @@ EVENT_TYPE_TO_CLASS = { 'HS_DESC': HSDescEvent, 'HS_DESC_CONTENT': HSDescContentEvent, 'INFO': LogEvent, + 'NETWORK_LIVENESS': NetworkLivenessEvent, 'NEWCONSENSUS': NewConsensusEvent, 'NEWDESC': NewDescEvent, 'NOTICE': LogEvent, diff --git a/stem/version.py b/stem/version.py index 1182bfc..a4e184a 100644 --- a/stem/version.py +++ b/stem/version.py @@ -39,6 +39,7 @@ easily parsed and compared, for instance... **EVENT_DESCCHANGED** DESCCHANGED events **EVENT_GUARD** GUARD events **EVENT_HS_DESC_CONTENT** HS_DESC_CONTENT events + **EVENT_NETWORK_LIVENESS** NETWORK_LIVENESS events **EVENT_NEWCONSENSUS** NEWCONSENSUS events **EVENT_NS** NS events **EVENT_SIGNAL** SIGNAL events @@ -349,6 +350,7 @@ Requirement = stem.util.enum.Enum( ('EVENT_GUARD', Version('0.1.2.5-alpha')), ('EVENT_HS_DESC_CONTENT', Version('0.2.7.1-alpha')), ('EVENT_NS', Version('0.1.2.3-alpha')), + ('EVENT_NETWORK_LIVENESS', Version('0.2.7.2-alpha')), ('EVENT_NEWCONSENSUS', Version('0.2.1.13-alpha')), ('EVENT_SIGNAL', Version('0.2.3.1-alpha')), ('EVENT_STATUS', Version('0.1.2.3-alpha')), diff --git a/test/unit/response/events.py b/test/unit/response/events.py index e5ddc1a..80cc9f1 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -919,6 +919,18 @@ class TestEvents(unittest.TestCase): self.assertEqual(NEWDESC_MULTIPLE.lstrip('650 '), str(event)) self.assertEqual(expected_relays, event.relays) + def test_network_liveness_event(self): + event = _get_event('650 NETWORK_LIVENESS UP') + self.assertTrue(isinstance(event, stem.response.events.NetworkLivenessEvent)) + self.assertEqual('NETWORK_LIVENESS UP', str(event)) + self.assertEqual('UP', event.status) + + event = _get_event('650 NETWORK_LIVENESS DOWN') + self.assertEqual('DOWN', event.status) + + event = _get_event('650 NETWORK_LIVENESS OTHER_STATUS key=value') + self.assertEqual('OTHER_STATUS', event.status) + def test_new_consensus_event(self): expected_desc = []

1 0

[torspec/master] Revise NETWORK_LIVENESS spec
by nickm＠torproject.org 19 May '15

19 May '15

commit e0e81d078af8c747bf08309c1a0c013d2f98efc3 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 19 08:03:13 2015 -0700 Revise NETWORK_LIVENESS spec Minor revisions for the new NETWORK_LIVENESS event... * Include a note about the version when this is being added. * No need to say new fields are allowed. This is said near the start of section 4.1... "Clients MUST tolerate events with arguments and keywords they do not recognize" * Rejigger the spec's style a tad to be more like other events. --- control-spec.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index c9f871b..5377658 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2789,15 +2789,13 @@ 4.1.27. Network liveness has changed Syntax: - "650" SP "NETWORK_LIVENESS" SP Status ... CRLF - Status = "UP" | "DOWN" + "650" SP "NETWORK_LIVENESS" SP Status CRLF + Status = "UP" / ; The network now seems to be reachable. + "DOWN" / ; The network now seems to be unreachable. - The Status values are: - "UP" -- The network now seems to be reachable. - "DOWN" -- The network now seems to be unreachable. + Controllers MUST tolerate unrecognized status types. - Controllers MUST ignore unrecognized Status values, and MUST ignore - unrecognized material at the end of the event line. + [NETWORK_LIVENESS was added in Tor 0.2.7.2-alpha] 5. Implementation notes

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 19 May '15

19 May '15

commit 6740741c4dac21242c97b8c2c34418586bdbf95e Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 12:46:35 2015 +0000 Update translations for torbutton-abouttorproperties_completed --- ru/abouttor.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ru/abouttor.properties b/ru/abouttor.properties new file mode 100644 index 0000000..6795b7c --- /dev/null +++ b/ru/abouttor.properties @@ -0,0 +1,21 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Ищите <a href="%1$S">конфиденциально</a> со <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Ищите <a href="%1$S">конфиденциально</a> с <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Ищите <a href="%1$S">конфиденциально</a> с <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 19 May '15

19 May '15

commit ad4d7a59984f22c74b8636dffcd5ce4c3f47929b Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 12:46:31 2015 +0000 Update translations for torbutton-abouttorproperties --- ru/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru/abouttor.properties b/ru/abouttor.properties index d607324..6795b7c 100644 --- a/ru/abouttor.properties +++ b/ru/abouttor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Ищите <a href="%1$S">конфиденциально</a> со <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Ищите <a href="%1$S">конфиденциально</a> с <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=Ищите <a href="%1$S">конфиденциально</a> с <a href="%2$S">Disconnect.me</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above.

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 19 May '15

19 May '15

commit 47c2e02b8632da9a80b3e8d7302ade5eb99d8116 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 12:46:26 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- ru/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ru/aboutdialog.dtd b/ru/aboutdialog.dtd new file mode 100644 index 0000000..71d28dd --- /dev/null +++ b/ru/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; разработано"> + +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", проект, созданный, чтобы защитить вашу конфиденциальность и свободу в сети."> + +<!ENTITY help.start "Желаете помочь?"> + +<!ENTITY help.donateLink "Пожертвовать"> +<!ENTITY help.or "или"> + +<!ENTITY help.getInvolvedLink "присоединяйтесь"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Вопросы?"> + +<!ENTITY bottomLinks.grow "Помогите сети Tor стать больше!"> + +<!ENTITY bottomLinks.license "Информация о лицензии"> +<!ENTITY tor.TrademarkStatement "'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc.">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 19 May '15

19 May '15

commit 670c0d2a86d3cbc66519637d51a818210e7da564 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 12:46:22 2015 +0000 Update translations for torbutton-aboutdialogdtd --- ru/aboutdialog.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ru/aboutdialog.dtd b/ru/aboutdialog.dtd index 5099ad7..71d28dd 100644 --- a/ru/aboutdialog.dtd +++ b/ru/aboutdialog.dtd @@ -1,19 +1,19 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; разработано">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", проект, созданный, чтобы защитить вашу конфиденциальность и свободу в сети."> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "Желаете помочь?">  -<!ENTITY help.donateLink "Donate"> -<!ENTITY help.or " or "> +<!ENTITY help.donateLink "Пожертвовать"> +<!ENTITY help.or "или">  -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolvedLink "присоединяйтесь"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "Вопросы?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Помогите сети Tor стать больше!">  -<!ENTITY bottomLinks.license "Licensing Information"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY bottomLinks.license "Информация о лицензии"> +<!ENTITY tor.TrademarkStatement "'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc.">

1 0

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

19 May '15

commit 1eba933634d228c3c1eb0c33b12ea2af87336717 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 12:46:04 2015 +0000 Update translations for torbutton-torbuttonproperties --- ru/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/torbutton.properties b/ru/torbutton.properties index a75acb7..62af84b 100644 --- a/ru/torbutton.properties +++ b/ru/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Этот браузер torbutton.circuit_display.relay = узел torbutton.circuit_display.tor_bridge = Ретранслятор torbutton.circuit_display.unknown_country = Неизвестная страна -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor Browser добавляет этот отступ, чтобы ширина и высота окна были менее узнаваемыми, и это усложняет возможность отследить Вас в сети. torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor torbutton.panel.plugins.disabled = Нажмите, чтобы включить плагины

1 0