- tor-commits - lists.torproject.org

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 10 Dec '12

10 Dec '12

commit 46458e2afde2d5ae043d1bcca7f9180a5dc987d6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 10 21:46:00 2012 +0000 Update translations for torbirdy --- ru/torbirdy.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ru/torbirdy.properties b/ru/torbirdy.properties index f22e5a9..6166080 100644 --- a/ru/torbirdy.properties +++ b/ru/torbirdy.properties @@ -12,4 +12,4 @@ torbirdy.email.advanced=Пожалуйста, обратите внимание, torbirdy.email.advanced.nextwarning=Показывать это предупреждение в следующий раз torbirdy.email.advanced.title=TorBirdy расширенные настройки -# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. +torbirdy.restart=Для установки временной зоны нажмите close и запустите ещё раз.

1 0

[torbrowser/master] use the right changelogs. closes #7668.
by erinn＠torproject.org 10 Dec '12

10 Dec '12

commit d986c08f7a86b87b9fcf99030418224c153ddb7b Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 10 16:06:40 2012 +0000 use the right changelogs. closes #7668. --- build-scripts/linux.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 137591b..0a1490e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -271,9 +271,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.2 $(DOCSDIR)/changelog + cp ../changelog.linux-2.3 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..652f92a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -262,9 +262,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.2 $(DOCSDIR)/changelog + cp ../changelog.osx-2.3 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.2 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index d3efa35..3dbe2be 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -265,8 +265,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.2 $(DOCSDIR)/changelog - cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.3 $(DOCSDIR)/changelog + cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over FirefoxPortable install-firefoxportable:

1 0

[torbrowser/maint-2.4] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 10 Dec '12

10 Dec '12

commit b2e32f48ed60e38c64c8f65d1a3e8b3ad7fd08a3 Merge: cd8ddac d986c08 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 10 16:07:05 2012 +0000 Merge branch 'maint-2.3' into maint-2.4 build-scripts/linux.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)

1 0

[torbrowser/maint-2.4] use the right changelogs. closes #7668.
by erinn＠torproject.org 10 Dec '12

10 Dec '12

commit d986c08f7a86b87b9fcf99030418224c153ddb7b Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 10 16:06:40 2012 +0000 use the right changelogs. closes #7668. --- build-scripts/linux.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 137591b..0a1490e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -271,9 +271,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.2 $(DOCSDIR)/changelog + cp ../changelog.linux-2.3 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..652f92a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -262,9 +262,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.2 $(DOCSDIR)/changelog + cp ../changelog.osx-2.3 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.2 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index d3efa35..3dbe2be 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -265,8 +265,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.2 $(DOCSDIR)/changelog - cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.3 $(DOCSDIR)/changelog + cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over FirefoxPortable install-firefoxportable:

1 0

[torbrowser/maint-2.3] use the right changelogs. closes #7668.
by erinn＠torproject.org 10 Dec '12

10 Dec '12

commit d986c08f7a86b87b9fcf99030418224c153ddb7b Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 10 16:06:40 2012 +0000 use the right changelogs. closes #7668. --- build-scripts/linux.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 137591b..0a1490e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -271,9 +271,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.2 $(DOCSDIR)/changelog + cp ../changelog.linux-2.3 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ceb3e7..652f92a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -262,9 +262,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.2 $(DOCSDIR)/changelog + cp ../changelog.osx-2.3 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.2 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index d3efa35..3dbe2be 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -265,8 +265,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.2 $(DOCSDIR)/changelog - cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.3 $(DOCSDIR)/changelog + cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle ## Copy over FirefoxPortable install-firefoxportable:

1 0

[torbrowser/master] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 10 Dec '12

10 Dec '12

commit b2e32f48ed60e38c64c8f65d1a3e8b3ad7fd08a3 Merge: cd8ddac d986c08 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 10 16:07:05 2012 +0000 Merge branch 'maint-2.3' into maint-2.4 build-scripts/linux.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)

1 0

[stem/master] Add enumeration of RELAY_END reasons
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 69a2c8193fd613ce057b6d0adb466a21437ef5ff Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 19:20:38 2012 -0700 Add enumeration of RELAY_END reasons This is for the reason to be given with the CLOSESTREAM command. NONE is a filler to make the remaining reasons start at offset one and will be rejected by the server, so it is not listed in the pydoc. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/__init__.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index cddf033..5eb6737 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -159,6 +159,29 @@ Library for working with the tor process. **HSSR_JOINED** connected to the rendezvous-point ============================= =========== +.. data:: RelayEndReason (enum) + + Enumeration for possible reasons to close a stream. + + =================== =========== + RelayEndReason Description + =================== =========== + **MISC** catch-all for unlisted reasons + **RESOLVEFAILED** couldn't look up hostname + **CONNECTREFUSED** remote host refused connection + **EXITPOLICY** OR refuses to connect to host or port + **DESTROY** Circuit is being destroyed + **DONE** Anonymized TCP connection was closed + **TIMEOUT** Connection timed out, or OR timed out while connecting + **NOROUTE** Routing error while attempting to contact destination + **HIBERNATING** OR is temporarily hibernating + **INTERNAL** Internal error at the OR + **RESOURCELIMIT** OR has no resources to fulfill request + **CONNRESET** Connection was unexpectedly reset + **TORPROTOCOL** Sent when closing connection because of Tor protocol violations. + **NOTDIRECTORY** Client sent RELAY_BEGIN_DIR to a non-directory relay. + =================== =========== + .. data:: StreamStatus (enum) State that a stream going through tor can have. Tor may provide states not in @@ -521,6 +544,24 @@ HiddenServiceState = stem.util.enum.UppercaseEnum( "HSSR_JOINED", ) +RelayEndReason = stem.util.enum.UppercaseEnum( + "NONE", + "MISC", + "RESOLVEFAILED", + "CONNECTREFUSED", + "EXITPOLICY", + "DESTROY", + "DONE", + "TIMEOUT", + "NOROUTE", + "HIBERNATING", + "INTERNAL", + "RESOURCELIMIT", + "CONNRESET", + "TORPROTOCOL", + "NOTDIRECTORY", +) + StreamStatus = stem.util.enum.UppercaseEnum( "NEW", "NEWRESOLVE",

1 0

[stem/master] Consolidating how StreamClosureReason is made
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 786624951b627ae76370ab3afe38997552b80ae2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 9 14:23:42 2012 -0800 Consolidating how StreamClosureReason is made --- stem/__init__.py | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 092413b..9dd0cb5 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -574,16 +574,11 @@ StreamStatus = stem.util.enum.UppercaseEnum( "CLOSED", ) -# add STREAM event specific reasons to the list of RELAY_END reasons -_tmp_StreamClosureReason = [v for v in RelayEndReason] -_tmp_StreamClosureReason.extend(( +# StreamClosureReason is a superset of RelayEndReason +StreamClosureReason = stem.util.enum.UppercaseEnum(*(RelayEndReason.keys() + ( "END", "PRIVATE_ADDR", -)) -# build UppercaseEnum from extended list -StreamClosureReason = stem.util.enum.UppercaseEnum(*_tmp_StreamClosureReason) -# remove temporary list -del _tmp_StreamClosureReason +))) StreamSource = stem.util.enum.UppercaseEnum( "CACHE",

1 0

[stem/master] Deduplicating RelayEndReason vs StreamClosureReason
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 33547a2b346b07f900d81be08f2dcd19451ea434 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 9 14:33:21 2012 -0800 Deduplicating RelayEndReason vs StreamClosureReason StreamClosureReason is a superset of RelayEndReason so there's no need to list both. Merging the enum descriptions and having StreamClosureReason refer to RelayEndReason. Also added RelayEndReason to __all__ so wildcard imports will pick it up. --- stem/__init__.py | 46 +++++++++++++++++----------------------------- 1 files changed, 17 insertions(+), 29 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 9dd0cb5..5d6d8fb 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -166,20 +166,20 @@ Library for working with the tor process. =================== =========== RelayEndReason Description =================== =========== - **MISC** catch-all for unlisted reasons - **RESOLVEFAILED** couldn't look up hostname - **CONNECTREFUSED** remote host refused connection - **EXITPOLICY** OR refuses to connect to host or port - **DESTROY** Circuit is being destroyed - **DONE** Anonymized TCP connection was closed - **TIMEOUT** Connection timed out, or OR timed out while connecting - **NOROUTE** Routing error while attempting to contact destination - **HIBERNATING** OR is temporarily hibernating - **INTERNAL** Internal error at the OR - **RESOURCELIMIT** OR has no resources to fulfill request - **CONNRESET** Connection was unexpectedly reset - **TORPROTOCOL** Sent when closing connection because of Tor protocol violations. - **NOTDIRECTORY** Client sent RELAY_BEGIN_DIR to a non-directory relay. + **MISC** none of the following reasons + **RESOLVEFAILED** unable to resolve the hostname + **CONNECTREFUSED** remote host refused the connection + **EXITPOLICY** OR refuses to connect to the destination + **DESTROY** circuit is being shut down + **DONE** connection has been closed + **TIMEOUT** connection timed out + **NOROUTE** routing error while contacting the destination + **HIBERNATING** relay is temporarily hibernating + **INTERNAL** internal error at the relay + **RESOURCELIMIT** relay has insufficient resources to service the request + **CONNRESET** connection was unexpectedly reset + **TORPROTOCOL** violation in the tor protocol + **NOTDIRECTORY** directory information requested from a relay that isn't mirroring it =================== =========== .. data:: StreamStatus (enum) @@ -203,26 +203,13 @@ Library for working with the tor process. .. data:: StreamClosureReason (enum) - Reason that a stream is being closed or failed to be established. Tor may + Reason that a stream is being closed or failed to be established. This + includes all values in the :data:`~stem.RelayEndReason` enumeration. Tor may provide reasons not in this enum. ===================== =========== StreamClosureReason Description ===================== =========== - **MISC** none of the following reasons - **RESOLVEFAILED** unable to resolve the hostname - **CONNECTREFUSED** remote host refused the connection - **EXITPOLICY** rejected by the exit due to its exit policy - **DESTROY** circuit is being shut down - **DONE** connection has been closed - **TIMEOUT** connection timed out - **NOROUTE** routing error while contacting the destination - **HIBERNATING** relay is hibernating - **INTERNAL** internal error - **RESOURCELIMIT** relay has insufficient resources to service the request - **CONNRESET** connection has been reset - **TORPROTOCOL** violation in the tor protocol - **NOTDIRECTORY** directory information requested from a relay that isn't mirroring it **END** endpoint has sent a RELAY_END cell **PRIVATE_ADDR** endpoint was a private address (127.0.0.1, 10.0.0.1, etc) ===================== =========== @@ -393,6 +380,7 @@ __all__ = [ "CircClosureReason", "CircEvent", "HiddenServiceState", + "RelayEndReason", "StreamStatus", "StreamClosureReason", "StreamSource",

1 0

[stem/master] Build StreamClosureReason as a superset of RelayEndReason
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 545f251b698281b5cd6bd3f704242c9fdafaa36b Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 19:24:28 2012 -0700 Build StreamClosureReason as a superset of RelayEndReason Explicitly make StreamClosureReason rely on RelayEndReason for its contents. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/__init__.py | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 5eb6737..092413b 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -574,24 +574,16 @@ StreamStatus = stem.util.enum.UppercaseEnum( "CLOSED", ) -StreamClosureReason = stem.util.enum.UppercaseEnum( - "MISC", - "RESOLVEFAILED", - "CONNECTREFUSED", - "EXITPOLICY", - "DESTROY", - "DONE", - "TIMEOUT", - "NOROUTE", - "HIBERNATING", - "INTERNAL", - "RESOURCELIMIT", - "CONNRESET", - "TORPROTOCOL", - "NOTDIRECTORY", +# add STREAM event specific reasons to the list of RELAY_END reasons +_tmp_StreamClosureReason = [v for v in RelayEndReason] +_tmp_StreamClosureReason.extend(( "END", "PRIVATE_ADDR", -) +)) +# build UppercaseEnum from extended list +StreamClosureReason = stem.util.enum.UppercaseEnum(*_tmp_StreamClosureReason) +# remove temporary list +del _tmp_StreamClosureReason StreamSource = stem.util.enum.UppercaseEnum( "CACHE",

1 0