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

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 03 Jun '15

03 Jun '15

commit 6e02900e93fd4f62f5751bd56c69b31f78e8682f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 3 02:16:21 2015 +0000 Update translations for tor_animation --- en_GB.srt | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/en_GB.srt b/en_GB.srt index 78c998d..0e6056a 100644 --- a/en_GB.srt +++ b/en_GB.srt @@ -40,126 +40,126 @@ and so much more information about you and your life 10 -00:00:29,620 --> 00:00:32,460 +00:00:29,200 --> 00:00:31,500 which you probably didn't mean to share with unknown strangers, 11 -00:00:32,920 --> 00:00:35,840 +00:00:31,700 --> 00:00:34,000 who could easily use this data to exploit you. 12 -00:00:36,220 --> 00:00:38,120 +00:00:34,500 --> 00:00:37,000 But not if you're using Tor! 13 -00:00:39,140 --> 00:00:42,840 +00:00:37,140 --> 00:00:40,840 Tor Browser protects our privacy and identity on the Internet. 14 -00:00:43,560 --> 00:00:46,760 +00:00:41,560 --> 00:00:44,760 Tor secures your connection with three layers of encryption 15 -00:00:46,940 --> 00:00:51,760 +00:00:44,940 --> 00:00:49,760 and passes it through three voluntarily operated servers around the world, 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 which enables us to communicate anonymously over the Internet. 17 -00:00:58,560 --> 00:01:00,280 +00:00:56,560 --> 00:00:58,280 Tor also protects our data 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 against corporate or government targeted and mass surveillance. 19 -00:01:04,880 --> 00:01:09,340 +00:01:02,880 --> 00:01:07,340 Perhaps you live in a repressive country which tries to control and surveil the Internet. 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 Or perhaps you don't want big corporations taking advantage of your personal information. 21 -00:01:14,880 --> 00:01:17,640 +00:01:12,880 --> 00:01:15,640 Tor makes all of its users to look the same 22 -00:01:17,920 --> 00:01:20,800 +00:01:15,920 --> 00:01:18,800 which confuses the observer and makes you anonymous. 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 So, the more people use the Tor network, the stronger it gets 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 as it's easier to hide in a crowd of people who look exactly the same. 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 You can bypass the censorship without being worried about 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 the censor knowing what you do on the Internet. 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 The ads won't follow you everywhere for months, 28 -00:01:41,640 --> 00:01:43,300 +00:01:39,640 --> 00:01:41,300 starting when you first clicked on a product. 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 By using Tor, the sites you visit won't even know who you are, 30 -00:01:49,540 --> 00:01:51,760 +00:01:47,540 --> 00:01:49,760 from what part of the world you're visiting them, 31 -00:01:51,920 --> 00:01:53,920 +00:01:49,920 --> 00:01:51,920 unless you login and tell them so. 32 -00:01:56,200 --> 00:01:57,840 +00:01:54,200 --> 00:01:55,840 By downloading and using Tor, 33 -00:01:58,200 --> 00:02:00,560 +00:01:56,200 --> 00:01:58,560 you can protect the people who need anonymity, 34 -00:02:00,880 --> 00:02:03,640 +00:01:58,880 --> 00:02:01,640 like activists, journalists and bloggers. 35 -00:02:04,000 --> 00:02:09,000 +00:02:02,000 --> 00:02:07,000 Download and use Tor! Or run a relay!

1 0

[bridgedb/develop] Merge branch 'fix/16273-gitweb-urls' into develop
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 82ede52d56571dbafbdd0db7102388267052fe2e Merge: a768c84 bd6bd83 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 2 21:06:53 2015 +0000 Merge branch 'fix/16273-gitweb-urls' into develop doc/proposals/XXX-bridgedb-database-improvements.txt | 4 ++-- doc/proposals/XXX-bridgedb-social-distribution.txt | 2 +- lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/bridges.py | 4 ++-- lib/bridgedb/templates/base.html | 2 +- lib/bridgedb/test/deprecated.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)

1 0

[bridgedb/develop] Update URLs for new gitweb.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit dea3d6c78cc124ae2aa08dc209b1662969c8b7d4 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jun 2 12:15:34 2015 -0700 Update URLs for new gitweb. --- doc/proposals/XXX-bridgedb-database-improvements.txt | 4 ++-- doc/proposals/XXX-bridgedb-social-distribution.txt | 2 +- lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/bridges.py | 4 ++-- lib/bridgedb/templates/base.html | 2 +- lib/bridgedb/test/deprecated.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/proposals/XXX-bridgedb-database-improvements.txt b/doc/proposals/XXX-bridgedb-database-improvements.txt index 2d25bd2..fcbd579 100644 --- a/doc/proposals/XXX-bridgedb-database-improvements.txt +++ b/doc/proposals/XXX-bridgedb-database-improvements.txt @@ -240,9 +240,9 @@ Status: Open [0]: https://bridges.torproject.org mailto:bridges@bridges.torproject.org [1]: See proposals 199-bridgefinder-integration.txt at - https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/199-bridgefi… + https://gitweb.torproject.org/torspec.git/tree/proposals/199-bridgefinder-i… [2]: See XXX-social-bridge-distribution.txt at - https://gitweb.torproject.org/user/isis/bridgedb.git/blob/refs/heads/featur… + https://gitweb.torproject.org/user/isis/bridgedb.git/tree/doc/proposals/XXX… [3]: https://metrics.torproject.org/formats.html#descriptortypes [4]: https://github.com/couchbase/couchbase-python-client#twisted-api [5]: https://twistedmatrix.com/documents/current/api/twisted.protocols.memcache.… diff --git a/doc/proposals/XXX-bridgedb-social-distribution.txt b/doc/proposals/XXX-bridgedb-social-distribution.txt index cd211c6..e424d34 100644 --- a/doc/proposals/XXX-bridgedb-social-distribution.txt +++ b/doc/proposals/XXX-bridgedb-social-distribution.txt @@ -481,7 +481,7 @@ Status: Draft Proceedings of the twelfth annual ACM-SIAM symposium on Discrete algorithms. Society for Industrial and Applied Mathematics, 2001. http://www.wisdom.weizmann.ac.il/%7Enaor/PAPERS/eotp.ps - https://gitweb.torproject.org/user/isis/bridgedb.git/tree/refs/heads/featur… + https://gitweb.torproject.org/user/isis/bridgedb.git/tree/doc/papers/naor20… [3]: https://crypto.stanford.edu/pbc/ http://repo.or.cz/r/pbc.git [4]: https://www.gitorious.org/pypbc/pages/Documentation diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 191dc08..d4e331e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -63,7 +63,7 @@ class BridgeRingParameters(object): :ivar list needFlags: List of two-tuples of desired flags_ assigned to a Bridge by the Bridge DirAuth. - .. _flags: https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt#l1696 + .. _flags: https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n1696 """ def __init__(self, needPorts=[], needFlags=[]): diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 0dfc4b1..5fe3355 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -109,7 +109,7 @@ class Flags(object): | "Valid" if the router has been 'validated'. .. _dir-spec.txt: - https://gitweb.torproject.org/torspec.git/blob/7647f6d4d:/dir-spec.txt#l1603 + https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt?id=7647f6d4d#n1… :param list flags: A list of strings containing each of the flags parsed from the 's'-line. @@ -223,7 +223,7 @@ class PluggableTransport(BridgeAddressBase): additional specification. .. _pt-spec.txt: - https://gitweb.torproject.org/torspec.git/blob/HEAD:/pt-spec.txt + https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt :type fingerprint: str :ivar fingerprint: The uppercased, hexadecimal fingerprint of the identity diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index f26837a..4a0b92d 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -91,7 +91,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)} <a href="https://gitweb.torproject.org/bridgedb.git"> <i class="icon icon-large icon-code"> ${_("Source Code")}</i></a>   ·   - <a href="https://gitweb.torproject.org/bridgedb.git/blob/HEAD:/CHANGELOG"> + <a href="https://gitweb.torproject.org/bridgedb.git/tree/CHANGELOG"> <i class="icon icon-large icon-rocket"> ${_("Changelog")}</i></a>   ·   <a href="mailto:help@rt.torproject.org"> diff --git a/lib/bridgedb/test/deprecated.py b/lib/bridgedb/test/deprecated.py index df660b6..39920a2 100644 --- a/lib/bridgedb/test/deprecated.py +++ b/lib/bridgedb/test/deprecated.py @@ -332,7 +332,7 @@ class PluggableTransport(object): {'password': 'NEQGQYLUMUQGK5TFOJ4XI2DJNZTS4LRO'} .. _pt-spec.txt: - https://gitweb.torproject.org/torspec.git/blob/HEAD:/pt-spec.txt + https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt """ #XXX: assert are disabled with python -O assert isinstance(bridge, Bridge)

1 0

[bridgedb/develop] Fix line number anchors in gitweb links.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit bd6bd837c5717077ba9cf08ab23611a665b93843 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jun 2 12:24:44 2015 -0700 Fix line number anchors in gitweb links. In one case, provide a commit hash so that the line number is relative to a known commit of the file. I found the commit in bridgedb.git where the URL was added, then found a commit in torspec.git that was around the same time and seems to point to the right place. Subtract one from the line numbers; maybe the old gitweb and the new are off by one relative to each other. --- lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/bridges.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index d4e331e..58a81cd 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -63,7 +63,7 @@ class BridgeRingParameters(object): :ivar list needFlags: List of two-tuples of desired flags_ assigned to a Bridge by the Bridge DirAuth. - .. _flags: https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n1696 + .. _flags: https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt?id=6b557594ef#n… """ def __init__(self, needPorts=[], needFlags=[]): diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 5fe3355..40cc7d9 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -109,7 +109,7 @@ class Flags(object): | "Valid" if the router has been 'validated'. .. _dir-spec.txt: - https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt?id=7647f6d4d#n1… + https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt?id=7647f6d4d#n1… :param list flags: A list of strings containing each of the flags parsed from the 's'-line.

1 0

[bridgedb/develop] Remove unused variable in bridgedb.Storage.Database.getAllBridgeHistory().
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit cbe9c2d44d4e3cd1ff37c9c97b129acad9e5739f Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:32:32 2015 +0000 Remove unused variable in bridgedb.Storage.Database.getAllBridgeHistory(). --- lib/bridgedb/Storage.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 334aadb..ea9d26b 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -288,7 +288,6 @@ class Database(object): cur = self._cur v = cur.execute("SELECT * FROM BridgeHistory") if v is None: return - fp = {} for h in v: yield BridgeHistory(h[0],IPAddress(h[1]),h[2],h[3],h[4],h[5],h[6],h[7],h[8],h[9],h[10])

1 0

[bridgedb/develop] Fix old-style class bridgedb.Storage.BridgeData.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 952f2823953758e02bfc13631dd1d83e6a261cd8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:32:13 2015 +0000 Fix old-style class bridgedb.Storage.BridgeData. --- lib/bridgedb/Storage.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 5d0eb6e..334aadb 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -107,7 +107,8 @@ SCHEMA_2TO3_SCRIPT = """ """ SCHEMA3_SCRIPT = SCHEMA2_SCRIPT + SCHEMA_2TO3_SCRIPT -class BridgeData: + +class BridgeData(object): """Value class carrying bridge information: hex_key - The unique hex key of the given bridge address - Bridge IP address @@ -126,6 +127,7 @@ class BridgeData: self.first_seen = first_seen self.last_seen = last_seen + class Database(object): def __init__(self, sqlite_fname): self._conn = openDatabase(sqlite_fname)

1 0

[bridgedb/develop] Remove additional unused imports from bridgedb.Storage.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit ed27c74d78deea385be1b353d0407d4fe49ef0df Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:31:19 2015 +0000 Remove additional unused imports from bridgedb.Storage. --- lib/bridgedb/Storage.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index d0660cf..5d0eb6e 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -3,7 +3,6 @@ # See LICENSE for licensing information import calendar -import os import logging import binascii import sqlite3 @@ -11,10 +10,9 @@ import time import hashlib from contextlib import GeneratorContextManager from functools import wraps -from ipaddr import IPAddress, IPv6Address, IPv4Address +from ipaddr import IPAddress import sys -import bridgedb.Stability as Stability from bridgedb.Stability import BridgeHistory import threading

1 0

[bridgedb/develop] Fix a docstring typo in bridgedb.Storage.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit fe567ec2243db738c03cf88ab76c6980ad91b046 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 11 20:21:05 2015 +0000 Fix a docstring typo in bridgedb.Storage. --- lib/bridgedb/Storage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index ef76829..d0660cf 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -384,7 +384,7 @@ _OPENED_DB = None _REFCOUNT = 0 def clearGlobalDB(): - """Start from scratch + """Start from scratch. This is currently only used in unit tests. """

1 0

[bridgedb/develop] Fix typo in bridgedb.bridges.Bridge.__init__() docstring.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit a768c8463f4e359de4122a550daeaca06595cfad Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:52:31 2015 +0000 Fix typo in bridgedb.bridges.Bridge.__init__() docstring. --- lib/bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index e1c8738..0dfc4b1 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -821,7 +821,7 @@ class Bridge(BridgeBackwardsCompatibility): _checkServerDescriptorSignature = True def __init__(self, *args, **kwargs): - """Create a and store information for a new ``Bridge``. + """Create and store information for a new ``Bridge``. .. info: For backwards compatibility, `nickname`, `ip`, and `orport` must be the first, second, and third arguments, respectively. The

1 0

[bridgedb/develop] Remove additional unused imports from bridgedb.Main module.
by isis＠torproject.org 02 Jun '15

02 Jun '15

commit 8694dbf65fe08cf615ceda260c48a664c2a8313e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 12 08:19:19 2015 +0000 Remove additional unused imports from bridgedb.Main module. --- lib/bridgedb/Main.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 76c122c..c2e44ca 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -11,12 +11,11 @@ """This module sets up BridgeDB and starts the servers running.""" +import logging import os import signal import sys import time -import logging -import gettext from twisted.internet import reactor from twisted.internet import task @@ -24,18 +23,14 @@ from twisted.internet import task from bridgedb import crypto from bridgedb import persistent from bridgedb import proxy -from bridgedb import safelog -from bridgedb import schedule from bridgedb import util from bridgedb.bridges import MalformedBridgeInfo from bridgedb.bridges import MissingServerDescriptorDigest from bridgedb.bridges import ServerDescriptorDigestMismatch from bridgedb.bridges import ServerDescriptorWithoutNetworkstatus -from bridgedb.bridges import PluggableTransport from bridgedb.bridges import Bridge from bridgedb.configure import loadConfig from bridgedb.parse import descriptors -from bridgedb.parse import options import bridgedb.Storage

1 0