- tor-commits - lists.torproject.org

r24522: {website} Label the Windows TBB instructions (website/trunk/projects/en)
by Robert Ransom 31 Mar '11

31 Mar '11

Author: rransom Date: 2011-04-01 02:19:19 +0000 (Fri, 01 Apr 2011) New Revision: 24522 Modified: website/trunk/projects/en/torbrowser.wml Log: Label the Windows TBB instructions Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2011-04-01 02:19:03 UTC (rev 24521) +++ website/trunk/projects/en/torbrowser.wml 2011-04-01 02:19:19 UTC (rev 24522) @@ -229,8 +229,11 @@ script. This will launch Vidalia and once that connects to Tor, it will launch Firefox.</p> + <a id="Windows"></a> + <h3><a class="anchor" href="#Windows">Windows instructions</a></h3> + <a id="Extraction"></a> - <h3><a class="anchor" href="#Extraction">Extraction</a></h3> + <h4><a class="anchor" href="#Extraction">Extraction</a></h4> <p>Download the file above, and save it somewhere, then double click on it. Click on the button labelled <strong>"..."</strong> (1) and select where you want @@ -247,7 +250,7 @@ extraction process" /></p> <a id="Usage"></a> - <h3><a class="anchor" href="#Usage">Usage</a></h3> + <h4><a class="anchor" href="#Usage">Usage</a></h4> <p>Once extraction is complete, open the folder <strong>Tor Browser</strong> from the location you saved the bundle.</p>

1 0

r24521: {website} Format the Linux TBB instructions better (website/trunk/projects/en)
by Robert Ransom 31 Mar '11

31 Mar '11

Author: rransom Date: 2011-04-01 02:19:03 +0000 (Fri, 01 Apr 2011) New Revision: 24521 Modified: website/trunk/projects/en/torbrowser.wml Log: Format the Linux TBB instructions better Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2011-04-01 01:27:08 UTC (rev 24520) +++ website/trunk/projects/en/torbrowser.wml 2011-04-01 02:19:03 UTC (rev 24521) @@ -221,11 +221,11 @@ <a id="Linux"></a> <h3><a class="anchor" href="#Linux">Linux instructions</a></h3> <p>Download the architecture-appropriate file above, save it somewhere, then - run:<br> tar -xvzf - tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-LANG.tar.gz or - tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-LANG.tar.gz (where + run:<br> <code>tar -xvzf + tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<var>LANG</var>.tar.gz</code> or + <code>tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<var>LANG</var>.tar.gz</code> (where LANG is the language listed in the filename), and either double click on the - directory or cd into it, then execute the <strong>start-tor-browser</strong> + directory or <code>cd</code> into it, then execute the <strong>start-tor-browser</strong> script. This will launch Vidalia and once that connects to Tor, it will launch Firefox.</p>

1 0

r24520: {website} Adding Thomas as a possible mentor for the 'Improving Tor's (website/trunk/getinvolved/en)
by Damian Johnson 31 Mar '11

31 Mar '11

Author: atagar Date: 2011-04-01 01:27:08 +0000 (Fri, 01 Apr 2011) New Revision: 24520 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding Thomas as a possible mentor for the 'Improving Tor's ability to resist censorship' idea, as per his request. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2011-03-31 21:28:11 UTC (rev 24519) +++ website/trunk/getinvolved/en/volunteer.wml 2011-04-01 01:27:08 UTC (rev 24520) @@ -710,7 +710,7 @@ <br> Skill Level: <i>High</i> <br> - Likely Mentors: <i>Roger, Nick, Jake</i> + Likely Mentors: <i>Roger, Nick, Jake, Thomas</i> <p>The Tor 0.2.1.x series makes <a href="<svnprojects>design-paper/blocking.html">significant improvements</a> in resisting national and organizational censorship.

1 0

r24519: {} Not everyone can handle an odp filecover the correct period (projects/presentations)
by Andrew Lewman 31 Mar '11

31 Mar '11

Author: phobos Date: 2011-03-31 21:28:11 +0000 (Thu, 31 Mar 2011) New Revision: 24519 Added: projects/presentations/2011-slide-masters.pdf projects/presentations/slides-berkeley11.pdf Log: Not everyone can handle an odp filecover the correct period of time. Added: projects/presentations/2011-slide-masters.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2011-slide-masters.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/slides-berkeley11.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/slides-berkeley11.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[torbrowser/master] add space to xauthority patch
by erinn＠torproject.org 31 Mar '11

31 Mar '11

commit b0eef9c8de26c4d8be1a16aa73e59770ebd8d48e Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 31 16:06:49 2011 +0200 add space to xauthority patch --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index c5b7b28..99e5255 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,7 +14,7 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi -if [ -z $XAUTHORITY]; then +if [ -z $XAUTHORITY ]; then XAUTHORITY=~/.Xauthority export XAUTHORITY fi

1 0

[bridgedb/master] Cherry-pick from Karsten's #2688 branch
by karsten＠torproject.org 31 Mar '11

31 Mar '11

commit e33aa7431ecee4cc4c4c8863e8126d611aa20c31 Author: Christian Fromme <kaner(a)strace.org> Date: Thu Mar 31 14:04:19 2011 +0200 Cherry-pick from Karsten's #2688 branch --- lib/bridgedb/Bucket.py | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 67f3774..004633b 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -30,7 +30,8 @@ PSEUDO_DISTRI_PREFIX = "pseudo_" class BucketData: """A file bucket value class. - name - Name of the bucket (From config) + name - Name of the bucket (From config), prefixed by pseudo + distributor prefix needed - Needed number of bridges for that bucket (From config) allocated - Number of already allocated bridges for that bucket """ @@ -81,17 +82,17 @@ class BucketManager: files by calling the dumpBridges() routine. cfg - The central configuration instance - bucketList - A list of BucketData instances, holding all + bucketList - A list of BucketData instances, holding all configured (and thus requested) buckets with their respective numbers - unallocatedList - Holding all bridges from the 'unallocated' + unallocatedList - Holding all bridges from the 'unallocated' pool - unallocated_available - Is at least one unallocated bridge + unallocated_available - Is at least one unallocated bridge available? - distributor_prefix - The 'distributor' field in the database will - hold the name of our pseudo-distributor, - prefixed by this - db - The bridge database access instance + distributor_prefix - The 'distributor' field in the database will + hold the name of our pseudo-distributor, + prefixed by this + db - The bridge database access instance """ def __init__(self, cfg): @@ -168,7 +169,8 @@ class BucketManager: self.addToUnallocatedList(bridge.hex_key) continue - # Filter 'https' and 'email' early, too + # Filter non-pseudo distributors (like 'https' and 'email') early, + # too if not bridge.distributor.startswith(self.distributor_prefix): continue @@ -186,13 +188,14 @@ class BucketManager: else: self.addToUnallocatedList(bridge.hex_key) - # Loop though bucketList while we have and need unallocated + # Loop through bucketList while we have and need unallocated # bridges, assign one bridge at a time while self.unallocated_available and len(self.bucketList) > 0: for d in self.bucketList: if d.allocated < d.needed: if not self.assignUnallocatedBridge(d): - print "Couldn't assign unallocated bridge to %s" % d.name + dist = d.name.replace(self.distributor_prefix, "") + print "Couldn't assign unallocated bridge to %s" % dist else: # When we have enough bridges, remove bucket identifier # from list @@ -208,7 +211,7 @@ class BucketManager: f.write(line + '\n') f.close() except IOError: - print "I/O error: %s" % fileName + print "I/O error: %s" % filename def dumpBridges(self): """Dump all known file distributors to files, sort by distributor

1 0

[bridgedb/master] Fix part 1 of #2688:
by karsten＠torproject.org 31 Mar '11

31 Mar '11

commit c3edb77408b5612078931992ef8e1e9e352d3c12 Author: Christian Fromme <kaner(a)strace.org> Date: Thu Mar 31 13:17:16 2011 +0200 Fix part 1 of #2688: - Don't re-assign buckets when its not necessary. --- lib/bridgedb/Bucket.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 1d5d753..5b20f95 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -133,7 +133,7 @@ class BucketManager: """ hex_key = self.unallocatedList.pop() # Mark pseudo-allocators in the database as such - allocator_name = self.distributor_prefix + bucket.name + allocator_name = bucket.name #print "KEY: %d NAME: %s" % (hex_key, allocator_name) try: self.db.updateDistributorForHexKey(allocator_name, hex_key) @@ -157,7 +157,8 @@ class BucketManager: """ # Build distributor list for k, v in self.cfg.FILE_BUCKETS.items(): - d = BucketData(k, v) + prefixed_key = self.distributor_prefix + k + d = BucketData(prefixed_key, v) self.bucketList.append(d) # Loop through all bridges and sort out distributors

1 0

[bridgedb/master] Filter non-pseudo distributors early to omit disaster.
by karsten＠torproject.org 31 Mar '11

31 Mar '11

commit 4bd711cd3b660d9b6e2870bc9bc0c0eb24692a86 Author: Christian Fromme <kaner(a)strace.org> Date: Thu Mar 31 13:34:13 2011 +0200 Filter non-pseudo distributors early to omit disaster. --- lib/bridgedb/Bucket.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 066b115..67f3774 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -168,6 +168,10 @@ class BucketManager: self.addToUnallocatedList(bridge.hex_key) continue + # Filter 'https' and 'email' early, too + if not bridge.distributor.startswith(self.distributor_prefix): + continue + # Return the bucket in case we know it already d = self.getBucketByIdent(bridge.distributor) if d is not None: @@ -176,14 +180,11 @@ class BucketManager: if d.allocated < d.needed: d.allocated += 1 else: + # Bucket has enough members already, free this one self.addToUnallocatedList(bridge.hex_key) # We don't know it. Maybe an old entry. Free it. else: - # DON'T free anything important! - if bridge.distributor.startswith(self.distributor_prefix): - self.addToUnallocatedList(bridge.hex_key) - # else - # SCREAM_LOUDLY? + self.addToUnallocatedList(bridge.hex_key) # Loop though bucketList while we have and need unallocated # bridges, assign one bridge at a time

1 0

[bridgedb/master] Fix part 2 of #2688:
by karsten＠torproject.org 31 Mar '11

31 Mar '11

commit a0439ad525435d03d3f19eb482a05f7a6d888ab6 Author: Christian Fromme <kaner(a)strace.org> Date: Thu Mar 31 13:24:32 2011 +0200 Fix part 2 of #2688: - Don't append to bucket files, overwrite existing files if necessary. --- lib/bridgedb/Bucket.py | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 5b20f95..066b115 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -197,29 +197,38 @@ class BucketManager: # from list self.bucketList.remove(d) - def dumpBridgeToFile(self, bridge, filename): - """Dump a given bridge into a given file + def dumpBridgesToFile(self, filename, bridges): + """Dump a list of given bridges into a file """ try: - f = open(filename, 'a') - line = "%s:%s" % (bridge.address, bridge.or_port) - f.write(line + '\n') + f = open(filename, 'w') + for b in bridges: + line = "%s:%s" % (b.address, b.or_port) + f.write(line + '\n') f.close() except IOError: - print "I/O error: %s" % filename - + print "I/O error: %s" % fileName + def dumpBridges(self): - """Dump all known file distributors to files + """Dump all known file distributors to files, sort by distributor """ allBridges = self.db.getAllBridges() + bridgeDict = {} + # Sort returned bridges by distributor for bridge in allBridges: - if bridge.distributor is "": - continue - distributor = bridge.distributor - if (distributor.startswith(self.distributor_prefix)): + dist = str(bridge.distributor) + if dist in bridgeDict.keys(): + bridgeDict[dist].append(bridge) + else: + bridgeDict[dist] = [bridge] + + # Now dump to file(s) + for k in bridgeDict.keys(): + dist = k + if (dist.startswith(self.distributor_prefix)): # Subtract the pseudo distributor prefix - distributor = distributor.replace(self.distributor_prefix, "") + dist = dist.replace(self.distributor_prefix, "") # Be safe. Replace all '/' in distributor names - distributor = distributor.replace("/", "_") - fileName = distributor + "-" + time.strftime("%Y-%m-%d") + ".brdgs" - self.dumpBridgeToFile(bridge, fileName) + dist = dist.replace("/", "_") + filename = dist + "-" + time.strftime("%Y-%m-%d") + ".brdgs" + self.dumpBridgesToFile(filename, bridgeDict[k])

1 0

r24518: {website} include polish translation of images on the overview page (website/trunk/about/pl)
by Runa Sandvik 31 Mar '11

31 Mar '11

Author: runa Date: 2011-03-31 11:42:29 +0000 (Thu, 31 Mar 2011) New Revision: 24518 Modified: website/trunk/about/pl/overview.wml Log: include polish translation of images on the overview page Modified: website/trunk/about/pl/overview.wml =================================================================== --- website/trunk/about/pl/overview.wml 2011-03-31 11:33:20 UTC (rev 24517) +++ website/trunk/about/pl/overview.wml 2011-03-31 11:42:29 UTC (rev 24518) @@ -153,7 +153,7 @@ <a name="thesolution"></a> <h3><a class="anchor" href="#thesolution">Rozwiązanie: rozproszona, anonimowa sieć</a></h3> - <img src="$(IMGROOT)/htw1.png" alt="Jak działa Tor"> + <img src="$(IMGROOT)/htw1_pl.png" alt="Jak działa Tor"> <p> Tor pozwala zmniejszyć ryzyko podatności na prostą i zaawansowaną analizę

1 0