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

[stem/master] Removing expectation that bridge nicknames are scrubbed
by atagar＠torproject.org 23 May '12

23 May '12

commit f7fb726cc3dea8bfd294833b151117858490802d Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 23 10:00:04 2012 -0700 Removing expectation that bridge nicknames are scrubbed Karsten plans to stop scrubbing bridge descriptor nicknames, so removing that expectation from the 'is_scrubbed()' method. --- stem/descriptor/server_descriptor.py | 8 ++++---- test/unit/descriptor/server_descriptor.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 0014ff5..f7d3437 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -720,11 +720,11 @@ class BridgeDescriptor(ServerDescriptor): if self._scrubbing_issues == None: issues = [] - if self.nickname != "Unnamed": - issues.append("Router line's nickname should be scrubbed to be 'Unnamed': %s" % self.nickname) - elif not self.address.startswith("10."): + + if not self.address.startswith("10."): issues.append("Router line's address should be scrubbed to be '10.x.x.x': %s" % self.address) - elif self.contact and self.contact != "somebody": + + if self.contact and self.contact != "somebody": issues.append("Contact line should be scrubbed to be 'somebody', but instead had '%s'" % self.contact) for address, _, is_ipv6 in self.address_alt: diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 0eb4891..53b4675 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -333,7 +333,6 @@ class TestServerDescriptor(unittest.TestCase): """ unsanitized_attr = [ - {"router": "caerSidi 10.45.227.253 9001 0 0"}, {"router": "Unnamed 75.45.227.253 9001 0 0"}, {"contact": "Damian"}, {"or-address": "71.35.133.197:9001"},

1 0

[stem/master] Citing ticket 4817 in related pydocs
by atagar＠torproject.org 23 May '12

23 May '12

commit f1d58b21fd5fe7dcd8b5330627f7521ac86ffbc0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 20 15:24:22 2012 -0700 Citing ticket 4817 in related pydocs The pydocs warn users of authenticate_cookie and authenticate_password that we can't reliably differentiate certain failures. Citing the related ticket. --- stem/connection.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index b81a8f7..983eb84 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -495,7 +495,8 @@ def authenticate_password(controller, password, suppress_ctl_errors = True): note: If you use this function directly, rather than authenticate(), we may mistakenly raise a PasswordAuthRejected rather than IncorrectPassword. This is because we rely on tor's error messaging which is liable to change in - future versions. + future versions... + https://trac.torproject.org/4817 Arguments: controller (stem.socket.ControlSocket or stem.control.BaseController) - @@ -559,7 +560,8 @@ def authenticate_cookie(controller, cookie_path, suppress_ctl_errors = True): note: If you use this function directly, rather than authenticate(), we may mistakenly raise a CookieAuthRejected rather than IncorrectCookieValue. This is because we rely on tor's error messaging which is liable to change in - future versions. + future versions... + https://trac.torproject.org/4817 Arguments: controller (stem.socket.ControlSocket or stem.control.BaseController) -

1 0

r25655: {website} update mirrors table, fix coluna again. (in website/trunk: . include)
by Andrew Lewman 23 May '12

23 May '12

Author: phobos Date: 2012-05-23 13:56:08 +0000 (Wed, 23 May 2012) New Revision: 25655 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update mirrors table, fix coluna again. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-05-23 00:44:48 UTC (rev 25654) +++ website/trunk/include/mirrors-table.wmi 2012-05-23 13:56:08 UTC (rev 25655) @@ -18,15 +18,15 @@ <tr> - <td>NL</td> + <td>PT</td> - <td>Amorphis</td> + <td>5ª Coluna</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://torproject.pt/dist/">http</a></td> + <td><a href="http://torproject.pt/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -69,40 +69,6 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>EE</td> - - <td>CyberSIDE</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IT</td> <td></td> @@ -205,23 +171,6 @@ <tr> - <td>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td></td> @@ -511,49 +460,66 @@ <tr> - <td>SE</td> + <td>DE</td> - <td>homosu</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>INT</td> + + <td>CoralCDN</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>[[:bbs:]]</td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>INT</td> + <td>DK</td> - <td>CoralCDN</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -562,6 +528,40 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>SE</td> + + <td>homosu</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>torproject.is</td> @@ -579,11 +579,28 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>TheOnionRouter</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://theonionrouter.com/dist/">http</a></td> @@ -681,23 +698,6 @@ <tr> - <td>PT</td> - - <td>5ª Coluna</td> - - <td>Out of date</td> - - <td> - </td> - <td><a href="http://torproject.pt/">http</a></td> - <td> - </td> - <td><a href="http://torproject.pt/dist/">https</a></td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>NL</td> <td>BIT BV</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-05-23 00:44:48 UTC (rev 25654) +++ website/trunk/update-mirrors.pl 2012-05-23 13:56:08 UTC (rev 25655) @@ -846,12 +846,12 @@ ipv4 => "True", ipv6 => "True", loadBalanced => "No", - httpWebsiteMirror => "", + httpWebsiteMirror => "http://torproject.pt/", httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://torproject.pt/", - httpsDistMirror => "http://torproject.pt/dist/", + httpDistMirror => "http://torproject.pt/dist/", + httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", },

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 23 May '12

23 May '12

commit c0f17c17116b13cc5f255a2fd8859b4f0d89186c Merge: 241327b 2282d5a Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 22 23:50:02 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 2 +- changelog.windows-2.2 | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] bump windows tbb for 2.2.35-13
by erinn＠torproject.org 23 May '12

23 May '12

commit 2282d5a644b32d2c927f7f856e67dd03d3ab8bb5 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 22 23:49:40 2012 -0300 bump windows tbb for 2.2.35-13 --- build-scripts/windows.mk | 2 +- changelog.windows-2.2 | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 7431d47..e9d2b28 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=12 +BUILD_NUM=13 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index fe7680a..3fd8a29 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-13); suite=windows + + * Fix Firefox build to sanitize file paths (closes: #5922) + + -- Erinn Clark <erinn(a)torproject.org> Tue May 22 23:28:37 BRT 2012 + Tor Browser Bundle (2.2.35-12); suite=windows * Update OpenSSL to 1.0.1c

1 0

[torbrowser/maint-2.2] bump windows tbb for 2.2.35-13
by erinn＠torproject.org 23 May '12

23 May '12

commit 2282d5a644b32d2c927f7f856e67dd03d3ab8bb5 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 22 23:49:40 2012 -0300 bump windows tbb for 2.2.35-13 --- build-scripts/windows.mk | 2 +- changelog.windows-2.2 | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 7431d47..e9d2b28 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=12 +BUILD_NUM=13 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index fe7680a..3fd8a29 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-13); suite=windows + + * Fix Firefox build to sanitize file paths (closes: #5922) + + -- Erinn Clark <erinn(a)torproject.org> Tue May 22 23:28:37 BRT 2012 + Tor Browser Bundle (2.2.35-12); suite=windows * Update OpenSSL to 1.0.1c

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 23 May '12

23 May '12

commit c0f17c17116b13cc5f255a2fd8859b4f0d89186c Merge: 241327b 2282d5a Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 22 23:50:02 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 2 +- changelog.windows-2.2 | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] bump windows tbb for 2.2.35-13
by erinn＠torproject.org 23 May '12

23 May '12

commit 2282d5a644b32d2c927f7f856e67dd03d3ab8bb5 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 22 23:49:40 2012 -0300 bump windows tbb for 2.2.35-13 --- build-scripts/windows.mk | 2 +- changelog.windows-2.2 | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 7431d47..e9d2b28 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=12 +BUILD_NUM=13 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index fe7680a..3fd8a29 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-13); suite=windows + + * Fix Firefox build to sanitize file paths (closes: #5922) + + -- Erinn Clark <erinn(a)torproject.org> Tue May 22 23:28:37 BRT 2012 + Tor Browser Bundle (2.2.35-12); suite=windows * Update OpenSSL to 1.0.1c

1 0

r25654: {website} address ticket 5706 by making the suggestion to use TBB far (website/trunk/docs/en)
by Andrew Lewman 23 May '12

23 May '12

Author: phobos Date: 2012-05-23 00:44:48 +0000 (Wed, 23 May 2012) New Revision: 25654 Modified: website/trunk/docs/en/tor-doc-osx.wml website/trunk/docs/en/tor-doc-unix.wml website/trunk/docs/en/tor-doc-web.wml website/trunk/docs/en/tor-doc-windows.wml Log: address ticket 5706 by making the suggestion to use TBB far stronger. Modified: website/trunk/docs/en/tor-doc-osx.wml =================================================================== --- website/trunk/docs/en/tor-doc-osx.wml 2012-05-22 16:37:49 UTC (rev 25653) +++ website/trunk/docs/en/tor-doc-osx.wml 2012-05-23 00:44:48 UTC (rev 25654) @@ -10,15 +10,14 @@ <a href="<page docs/tor-doc-osx>">Mac OS X Client</a> </div> <div id="maincol"> - <h1>Running the <a href="<page index>">Tor</a> client on Mac OS X</h1> + <h1>Running the Tor client on Mac OS X</h1> <br> - <p> - <b>Note that these are the installation instructions for running a Tor client on - Mac OS X. If you want to relay traffic for others to help the network - grow (please do), read the <a - href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.</b> - </p> + <h2>Note that these are the installation instructions for running + a Tor client. The easiest way to do this is to simply download the + <a href="<page projects/torbrowser>">Tor Browser Bundle</a> and you + are done. + </h2> <hr> <a id="installing"></a> Modified: website/trunk/docs/en/tor-doc-unix.wml =================================================================== --- website/trunk/docs/en/tor-doc-unix.wml 2012-05-22 16:37:49 UTC (rev 25653) +++ website/trunk/docs/en/tor-doc-unix.wml 2012-05-23 00:44:48 UTC (rev 25654) @@ -13,12 +13,11 @@ <h1>Running the <a href="<page index>">Tor</a> client on Linux/BSD/Unix</h1> <br> - <p> - <b>Note that these are the installation instructions for running a + <h2>Note that these are the installation instructions for running a Tor client. The easiest way to do this is to simply download the <a href="<page projects/torbrowser>">Tor Browser Bundle</a> and you are - done. </b> - </p> + done. + </h2> <hr> <a id="installing"></a> Modified: website/trunk/docs/en/tor-doc-web.wml =================================================================== --- website/trunk/docs/en/tor-doc-web.wml 2012-05-22 16:37:49 UTC (rev 25653) +++ website/trunk/docs/en/tor-doc-web.wml 2012-05-23 00:44:48 UTC (rev 25654) @@ -10,12 +10,12 @@ <a href="<page docs/tor-doc-web>">Configure Your Browser</a> </div> <div id="maincol"> - <h1>Configuring your browser to use <a href="<page index>">Tor</a></h1> + <h1>Configuring your browser to use Tor</h1> <br> - <p>We strongly encourage you to use the <a href="<page + <h2>We strongly encourage you to use the <a href="<page projects/torbrowser>">Tor Browser Bundle</a> instead of configuring - your own browser for usage with Tor.</p> + your own browser for usage with Tor.</h2> <br> Modified: website/trunk/docs/en/tor-doc-windows.wml =================================================================== --- website/trunk/docs/en/tor-doc-windows.wml 2012-05-22 16:37:49 UTC (rev 25653) +++ website/trunk/docs/en/tor-doc-windows.wml 2012-05-23 00:44:48 UTC (rev 25654) @@ -13,9 +13,12 @@ <h1>Running the <a href="<page index>">Tor</a> client on Microsoft Windows</h1> <br> - <p>We strongly encourage you to use the <a href="<page - projects/torbrowser>">Tor Browser Bundle</a> instead of configuring - your own browser for usage with Tor.</p> + <h2> + Note that these are the installation instructions for running a Tor + client. The easiest way to do this is to simply download the <a + href="<page projects/torbrowser>">Tor Browser Bundle</a> and you + are done. + </h2> <p> <b>Note that these are the installation instructions for running a Tor

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 23 May '12

23 May '12

commit 241327b8539cf2b75ae02d5dad1bd04a4423b8a1 Merge: 53fb950 e5c15ee Author: Erinn Clark <erinn(a)torproject.org> Date: Tue May 22 21:03:59 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 5 ++++- src/current-patches/mozilla-build/start-msvc.patch | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0