- tor-commits - lists.torproject.org

[arm/master] fix: dropping pointless desc publishing entry
by atagar＠torproject.org 06 Jul '11

06 Jul '11

commit ec03338fd926debd68d1c81a7f38e0723f129a9f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 5 14:23:36 2011 -0700 fix: dropping pointless desc publishing entry The 'PublishServerDescriptor bridge' entry for bridges is pointless as per: https://trac.torproject.org/projects/tor/ticket/3529 --- src/resources/torrcTemplate.txt | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index bb4dccd..3c9387f 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -36,10 +36,7 @@ CookieAuthentication 1 # method for controller authentication [IF BRIDGE] BridgeRelay 1 # makes us a bridge rather than a public relay - [IF DISTRIBUTE] - # TODO: drop this? - PublishServerDescriptor bridge # publishes to users looking for bridges - [ELSE] + [IF NOT DISTRIBUTE] PublishServerDescriptor 0 # keeps our bridge descriptor private [END IF] [END IF]

1 0

[arm/master] fix: extra slash in fallback conf desc path
by atagar＠torproject.org 06 Jul '11

06 Jul '11

commit a90ede962f9466f1019f36cc3d0038cd170be671 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 5 14:35:39 2011 -0700 fix: extra slash in fallback conf desc path The prefix path used for fallback configuration descriptions already ended with a slash, so the resulting path had an extra... <prefix>//resources/torConfigDesc.txt this didn't harm anything but might as well be corrected. --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 1b6049a..234bf16 100644 --- a/src/starter.py +++ b/src/starter.py @@ -168,7 +168,7 @@ def _loadConfigurationDescriptions(pathPrefix): if not isConfigDescriptionsLoaded: try: loadStartTime = time.time() - loadedVersion = util.torConfig.loadOptionDescriptions(pathPrefix + "/resources/" + CONFIG_DESC_FILENAME, False) + loadedVersion = util.torConfig.loadOptionDescriptions("%sresources/%s" % (pathPrefix, CONFIG_DESC_FILENAME), False) isConfigDescriptionsLoaded = True msg = DESC_INTERNAL_LOAD_SUCCESS_MSG % loadedVersion

1 0

[arm/master] fix: missing User entry from generated torrc
by atagar＠torproject.org 06 Jul '11

06 Jul '11

commit 527726affb18eec22dbc3c4bc243d74852ea6c69 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 6 15:06:45 2011 -0700 fix: missing User entry from generated torrc Adding the User config option when using low ports and a minor fix to comment alignments. --- src/cli/wizard.py | 5 ++--- src/resources/torrcTemplate.txt | 39 ++++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index d585ce5..8ad7208 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -474,9 +474,8 @@ def getTorrc(relayType, config): # shows a comment at the start of the section saying what it's for topicComment = CONFIG["port.category"].get(category) if topicComment: - while topicComment: - commentSegment, topicComment = uiTools.cropStr(topicComment, 78, None, endType = None, getRemainder = True) - policyLines.append("# " + commentSegment.strip()) + for topicComp in _splitStr(topicComment, 78): + policyLines.append("# " + topicComp) for portEntry in CONFIG.get("port.exit.%s" % category, []): # port entry might be an individual port or a range diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index 7462382..abedd7f 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -7,34 +7,38 @@ # Descriptions of all of these configuraiton attibutes (and many more) are # available in the tor man page. [NEWLINE] -ControlPort 9052 # port controllers can connect to -CookieAuthentication 1 # method for controller authentication +ControlPort 9052 # port controllers can connect to +CookieAuthentication 1 # method for controller authentication [IF RELAY | EXIT | BRIDGE] - RunAsDaemon 1 # runs as a background process + RunAsDaemon 1 # runs as a background process + + [IF LOWPORTS] + User tor-arm # lowers our permissions to this user + [END IF] [END IF] [NEWLINE] [IF RELAY | EXIT | BRIDGE] [IF LOWPORTS] - ORPort 443 # port used for relaying traffic + ORPort 443 # port used for relaying traffic [ELSE] - ORPort 9001 # port used for relaying traffic + ORPort 9001 # port used for relaying traffic [END IF] [IF RELAY | EXIT] [IF LOWPORTS] - DirPort 80 # port used for mirroring directory information + DirPort 80 # port used for mirroring directory information [ELSE] - DirPort 9030 # port used for mirroring directory information + DirPort 9030 # port used for mirroring directory information [END IF] - Nickname [NICKNAME] # name for this relay - ContactInfo [CONTACT] # contact information in case there's an issue + Nickname [NICKNAME] # name for this relay + ContactInfo [CONTACT] # contact information in case there's an issue [END IF] [IF BRIDGE] - BridgeRelay 1 # makes us a bridge rather than a public relay + BridgeRelay 1 # makes us a bridge rather than a public relay [IF NOT DISTRIBUTE] PublishServerDescriptor 0 # keeps our bridge descriptor private @@ -43,18 +47,18 @@ CookieAuthentication 1 # method for controller authentication RelayBandwidthRate [BANDWIDTH] # limit for the bandwidth we'll use to relay RelayBandwidthBurst [BURST] # maximum rate when relaying bursts of traffic - AccountingMax [LIMIT] # maximum amount of traffic we'll relay per month + AccountingMax [LIMIT] # maximum amount of traffic we'll relay per month [IF NOT CLIENT] - SocksPort 0 # prevents tor from being used as a client + SocksPort 0 # prevents tor from being used as a client [END IF] [IF PORTFORWARD] - PortForwarding 1 # negotiates UPnP and NAT-PMP if needed + PortForwarding 1 # negotiates UPnP and NAT-PMP if needed [END IF] [IF RELAY | BRIDGE] - ExitPolicy reject *:* # prevents us from connecting to non-relays + ExitPolicy reject *:* # prevents us from connecting to non-relays [ELSE] [IF NOTICE] DirPortFrontPage [NOTICE_PATH] # disclaimer saying that this is an exit @@ -62,15 +66,16 @@ CookieAuthentication 1 # method for controller authentication [NEWLINE] [EXIT_POLICY] - ExitPolicy reject *:* # prevents any exit traffic not permitted above + ExitPolicy reject *:* # prevents any exit traffic not permitted above [END IF] [ELSE] - ClientOnly 1 # prevents us from ever being used as a relay + ClientOnly 1 # prevents us from ever being used as a relay MaxCircuitDirtiness [REUSE] # duration that circuits can be reused [IF BRIDGED] - UseBridges 1 # uses the following bridges to connect + UseBridges 1 # uses the following bridges to connect [BRIDGES] [END IF] [END IF] +[NEWLINE]

1 0

r24863: {website} get the po2wml script ready for when I figure out how to put (website/trunk)
by Runa Sandvik 06 Jul '11

06 Jul '11

Author: runa Date: 2011-07-06 18:48:32 +0000 (Wed, 06 Jul 2011) New Revision: 24863 Modified: website/trunk/po2wml.sh Log: get the po2wml script ready for when I figure out how to put a video on media.tpo Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-07-05 14:57:24 UTC (rev 24862) +++ website/trunk/po2wml.sh 2011-07-06 18:48:32 UTC (rev 24863) @@ -316,6 +316,13 @@ # Footer echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + + # If the file is tor-doc-windows, make + # sure we include the German video + if [ $wmlfile = "tor-doc-windows.wml" ] + then + sed -i "s@src\=\"https://media.torproject.org/video/2009-install-and-use-tor.ogv\"@src\=\"https://media.torproject.org/video/2011-install-and-use-tor-de.mp4@" "$wmldir/$subdir/$lang/$wmlfile" + fi fi # If the file is an Arabic translation, include the

1 0

[tor/master] Fix weird formatting of html manpage
by nickm＠torproject.org 06 Jul '11

06 Jul '11

commit 1a016c923348c125d79d2e92c2ae9fa2fa2a5af8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jul 6 10:38:01 2011 +0200 Fix weird formatting of html manpage Asciidoc was inserting <pre> tags for paragraphs that started with a '+' at the beginning of the line. Instead, we need a space in front of the plus. --- doc/tor.1.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1815a8d..8f80c9f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -509,14 +509,14 @@ The following options are useful only for clients (that is, if patterns of nodes to avoid when building a circuit. (Example: ExcludeNodes SlowServer, $ EFFFFFFFFFFFFFFF, \{cc}, 255.254.0.0/8) + -+ + + By default, this option is treated as a preference that Tor is allowed to override in order to keep working. For example, if you try to connect to a hidden service, but you have excluded all of the hidden service's introduction points, Tor will connect to one of them anyway. If you do not want this behavior, set the StrictNodes option (documented below). + -+ + + Note also that if you are a relay, this (and the other node selection options below) only affects your own circuits that Tor builds for you. Clients can still build circuits through you to any node. Controllers @@ -535,22 +535,22 @@ The following options are useful only for clients (that is, if A list of identity fingerprints, nicknames, country codes and address patterns of nodes to use as exit node---that is, a node that delivers traffic for you outside the Tor network. + -+ + + Note that if you list too few nodes here, or if you exclude too many exit nodes with ExcludeExitNodes, you can degrade functionality. For example, if none of the exits you list allows traffic on port 80 or 443, you won't be able to browse the web. + -+ + + Note also that not every circuit is used to deliver traffic outside of the Tor network. It is normal to see non-exit circuits (such as those used to connect to hidden services, those that do directory fetches, those used for relay reachability self-tests, and so on) that end at a non-exit node. To keep a node from being used entirely, see ExcludeNodes and StrictNodes. + -+ + + The ExcludeNodes option overrides this option: any node listed in both ExitNodes and ExcludeNodes is treated as excluded. + -+ + + The .exit address notation, if enabled via AllowDotExit, overrides this option. @@ -561,7 +561,7 @@ The following options are useful only for clients (that is, if circuits except for direct connections to directory servers. The Bridge option overrides this option; if you have configured bridges and UseBridges is 1, the Bridges are used as your entry nodes. + -+ + + The ExcludeNodes option overrides this option: any node listed in both EntryNodes and ExcludeNodes is treated as excluded.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 06 Jul '11

06 Jul '11

commit eee942c5bed2d93cd4413c8c2fb13539d5816b69 Merge: ab8c0d4 1a016c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 6 10:56:47 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/tor.1.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.2] Fix weird formatting of html manpage
by nickm＠torproject.org 06 Jul '11

06 Jul '11

commit 1a016c923348c125d79d2e92c2ae9fa2fa2a5af8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jul 6 10:38:01 2011 +0200 Fix weird formatting of html manpage Asciidoc was inserting <pre> tags for paragraphs that started with a '+' at the beginning of the line. Instead, we need a space in front of the plus. --- doc/tor.1.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1815a8d..8f80c9f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -509,14 +509,14 @@ The following options are useful only for clients (that is, if patterns of nodes to avoid when building a circuit. (Example: ExcludeNodes SlowServer, $ EFFFFFFFFFFFFFFF, \{cc}, 255.254.0.0/8) + -+ + + By default, this option is treated as a preference that Tor is allowed to override in order to keep working. For example, if you try to connect to a hidden service, but you have excluded all of the hidden service's introduction points, Tor will connect to one of them anyway. If you do not want this behavior, set the StrictNodes option (documented below). + -+ + + Note also that if you are a relay, this (and the other node selection options below) only affects your own circuits that Tor builds for you. Clients can still build circuits through you to any node. Controllers @@ -535,22 +535,22 @@ The following options are useful only for clients (that is, if A list of identity fingerprints, nicknames, country codes and address patterns of nodes to use as exit node---that is, a node that delivers traffic for you outside the Tor network. + -+ + + Note that if you list too few nodes here, or if you exclude too many exit nodes with ExcludeExitNodes, you can degrade functionality. For example, if none of the exits you list allows traffic on port 80 or 443, you won't be able to browse the web. + -+ + + Note also that not every circuit is used to deliver traffic outside of the Tor network. It is normal to see non-exit circuits (such as those used to connect to hidden services, those that do directory fetches, those used for relay reachability self-tests, and so on) that end at a non-exit node. To keep a node from being used entirely, see ExcludeNodes and StrictNodes. + -+ + + The ExcludeNodes option overrides this option: any node listed in both ExitNodes and ExcludeNodes is treated as excluded. + -+ + + The .exit address notation, if enabled via AllowDotExit, overrides this option. @@ -561,7 +561,7 @@ The following options are useful only for clients (that is, if circuits except for direct connections to directory servers. The Bridge option overrides this option; if you have configured bridges and UseBridges is 1, the Bridges are used as your entry nodes. + -+ + + The ExcludeNodes option overrides this option: any node listed in both EntryNodes and ExcludeNodes is treated as excluded.

1 0

[metrics-web/master] Add relay stability tech report to metrics website.
by karsten＠torproject.org 06 Jul '11

06 Jul '11

commit c1e85a21cee3185fbcae506d26aa690e1859e46b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 6 13:05:16 2011 +0200 Add relay stability tech report to metrics website. --- web/WEB-INF/index.jsp | 4 ++++ web/WEB-INF/papers.jsp | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/web/WEB-INF/index.jsp b/web/WEB-INF/index.jsp index 0da160b..23845a6 100644 --- a/web/WEB-INF/index.jsp +++ b/web/WEB-INF/index.jsp @@ -32,6 +32,10 @@ <br> <h3>News</h3> <ul> + <li>July 4, 2011: Technical report + <a href="papers/relay-stability-2011-06-30.pdf">An Analysis of + Tor Relay Stability</a> is available for download on the + <a href="papers.html">Papers</a> page.</li> <li>March 14, 2011: <a href="data.html#bridgeassignments">Sanitized bridge pool assignments</a> containing lists of running bridges with diff --git a/web/WEB-INF/papers.jsp b/web/WEB-INF/papers.jsp index 50f8bda..6011a20 100644 --- a/web/WEB-INF/papers.jsp +++ b/web/WEB-INF/papers.jsp @@ -45,6 +45,12 @@ been included in the <a href="#papers">papers</a> above or in the daily updated <a href="graphs.html">graphs</a>. <ul> + <li>An Analysis of Tor Relay Stability (<a + href="papers/relay-stability-2011-06-30.pdf">PDF</a>, 1.3M from + June 30, 2011, + <a href="https://gitweb.torproject.org/metrics-tasks.git/tree/HEAD:/task-2911">code</a>, + <a href="data/running-relays-reverse.csv.bz2">data</a>, + 322M).</li> <li>Overview of Statistical Data in the Tor Network (<a href="papers/data-2011-03-14.pdf">PDF</a>, 166K from March 14, 2011).</li>

1 0

[metrics-web/master] Mention how to identify stable Tor versions.
by karsten＠torproject.org 06 Jul '11

06 Jul '11

commit 4a241c7cab1af41385ea568f55d572bb2e1f18ee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 6 13:05:38 2011 +0200 Mention how to identify stable Tor versions. --- web/WEB-INF/network.jsp | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 7906789..1789cb7 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -129,8 +129,12 @@ average number of relays with these flags assigned.</p> <h3>Relays by version</h3> <br> <p>Relays report the Tor version that they are running to the directory -authorities. The following graph shows the number of relays by -version.</p> +authorities. See the +<a href="https://www.torproject.org/download/download.html.en">download +page</a> and +<a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">ChangeLog file</a> +to find out which Tor versions are stable and unstable. +The following graph shows the number of relays by version.</p> <a name="versions"></a> <img src="versions.png${versions_url}" width="576" height="360" alt="Relay versions graph">

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit ab8c0d4c9e23b1c4e2d9e56d87b1b61505a2a8db Merge: 7295ad1 4f74979 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jul 6 00:49:11 2011 -0400 Merge branch 'maint-0.2.2' src/or/circuitbuild.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0