March 2011 - tor-commits - lists.torproject.org

[bridgedb/master] Add a more verbose comment on what insertBridgeAndGetRing() does now.
by karsten＠torproject.org 10 Mar '11

10 Mar '11

commit daa394e94d275499dca2f96aed443e2fd67049bd Author: Christian Fromme <kaner(a)strace.org> Date: Tue Mar 8 20:09:53 2011 +0100 Add a more verbose comment on what insertBridgeAndGetRing() does now. --- lib/bridgedb/Storage.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index ae48dde..62ed71c 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -178,8 +178,11 @@ class Database: def insertBridgeAndGetRing(self, bridge, setRing, seenAt, validRings, defaultPool="unallocated"): - '''updates info about bridge, setting ring to setRing if none was set. - Returns the bridge's validated ring. + '''Updates info about bridge, setting ring to setRing if none was set. + Also sets distributor to `defaultPool' if the bridge was found in + the database, but its distributor isn't valid anymore. + + Returns the name of the distributor the bridge is assigned to. ''' cur = self._cur

1 0

r24330: {website} put phobos's defaults back into the publish script and Makef (website/trunk)
by Erinn Clark 10 Mar '11

10 Mar '11

Author: erinn Date: 2011-03-10 09:48:56 +0000 (Thu, 10 Mar 2011) New Revision: 24330 Modified: website/trunk/Makefile website/trunk/publish Log: put phobos's defaults back into the publish script and Makefile Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-03-10 09:16:44 UTC (rev 24329) +++ website/trunk/Makefile 2011-03-10 09:48:56 UTC (rev 24330) @@ -10,7 +10,7 @@ # 4. make # 5. ./publish -export TORGIT=/Users/erinn/src/tor.git/.git +export TORGIT=/home/phobos/onionrouter/onionrouter/tor.git/.git export STABLETAG=tor-0.2.2.22-alpha export DEVTAG=tor-0.2.2.22-alpha Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-03-10 09:16:44 UTC (rev 24329) +++ website/trunk/publish 2011-03-10 09:48:56 UTC (rev 24330) @@ -5,8 +5,7 @@ make -j3 # don't copy over stuff with permissions that make it useless -#chmod a+r * -R -chmod -R a+r * +chmod a+r * -R rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update"

1 0

[metrics-db/master] Warn if a bridge network status is possibly stale.
by karsten＠torproject.org 10 Mar '11

10 Mar '11

commit ae9220cb41083c876af3a7492cf0d5218eaf1d60 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 10 09:17:06 2011 +0100 Warn if a bridge network status is possibly stale. In February 2011, Tonga's tor process died, but it's tar cronjob continued to suppy us with "fresh" bridge descriptor tarballs (containing stale descriptors). We didn't detect this for two weeks, because we derive the bridge network status publication time from the tarball filename, and it looked recent all the time. Adding a check whether the most recent descriptor that is contained in a bridge network status was published more than 1 hour before the status itself. This is a sign for the status being stale, even though it's not 100% reliable. We still should investigate these cases when they occur. A test with the January and February 2011 tarballs shows that we'd have learned about Tonga's tor process dying 60-90 minutes after the fact. --- .../ernie/db/SanitizedBridgesWriter.java | 25 ++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index aa1bcec..7376e5a 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -403,6 +403,7 @@ public class SanitizedBridgesWriter { BufferedReader br = new BufferedReader(new StringReader(new String( data, "US-ASCII"))); String line = null; + String mostRecentDescPublished = null; while ((line = br.readLine()) != null) { /* r lines contain sensitive information that needs to be removed @@ -433,6 +434,13 @@ public class SanitizedBridgesWriter { this.bridgeDescriptorMappings.put(mappingKey, mapping); } + /* Determine most recent descriptor publication time. */ + if (descPublicationTime.compareTo(publicationTime) <= 0 && + (mostRecentDescPublished == null || + descPublicationTime.compareTo(mostRecentDescPublished) > 0)) { + mostRecentDescPublished = descPublicationTime; + } + /* Write scrubbed r line to buffer. */ String hashedBridgeIdentityBase64 = Base64.encodeBase64String( DigestUtils.sha(Base64.decodeBase64(bridgeIdentity @@ -480,6 +488,23 @@ public class SanitizedBridgesWriter { scrubbed = new StringBuilder(); } + /* Check if we can tell from the descriptor publication times + * whether this status is possibly stale. */ + SimpleDateFormat formatter = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + formatter.setTimeZone(TimeZone.getTimeZone("UTC")); + if (formatter.parse(publicationTime).getTime() - + formatter.parse(mostRecentDescPublished).getTime() > + 60L * 60L * 1000L) { + this.logger.warning("The most recent descriptor in the bridge " + + "network status published at " + publicationTime + " was " + + "published at " + mostRecentDescPublished + " which is " + + "more than 1 hour before the status. This is a sign for " + + "the status being stale. Please check!"); + } + } catch (ParseException e) { + this.logger.log(Level.WARNING, "Could not parse timestamp in " + + "bridge network status.", e); } catch (IOException e) { this.logger.log(Level.WARNING, "Could not parse bridge network " + "status.", e);

1 0

[metrics-db/master] Fix embarrassing bug in bridge descriptor sanitizer.
by karsten＠torproject.org 10 Mar '11

10 Mar '11

commit 7b2845e1bba2c4a8f13eab936befdc29151862f3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 10 10:00:44 2011 +0100 Fix embarrassing bug in bridge descriptor sanitizer. --- .../ernie/db/BridgeDescriptorParser.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/BridgeDescriptorParser.java b/src/org/torproject/ernie/db/BridgeDescriptorParser.java index 9453088..95071a3 100644 --- a/src/org/torproject/ernie/db/BridgeDescriptorParser.java +++ b/src/org/torproject/ernie/db/BridgeDescriptorParser.java @@ -22,7 +22,7 @@ public class BridgeDescriptorParser { new String(allData, "US-ASCII"))); boolean skip = false; String line = br.readLine(); - if (line != null) { + if (line == null) { return; } else if (line.startsWith("r ")) { if (this.sbw != null) {

1 0

r24329: {website} update the tor im browser bundle version too, to at least be (in website/trunk: . include)
by Erinn Clark 10 Mar '11

10 Mar '11

Author: erinn Date: 2011-03-10 09:16:44 +0000 (Thu, 10 Mar 2011) New Revision: 24329 Modified: website/trunk/Makefile website/trunk/include/versions.wmi website/trunk/publish Log: update the tor im browser bundle version too, to at least be truthful. but we should drop it after an announcement. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-03-10 09:08:17 UTC (rev 24328) +++ website/trunk/Makefile 2011-03-10 09:16:44 UTC (rev 24329) @@ -10,7 +10,7 @@ # 4. make # 5. ./publish -export TORGIT=/home/phobos/onionrouter/onionrouter/tor.git/.git +export TORGIT=/Users/erinn/src/tor.git/.git export STABLETAG=tor-0.2.2.22-alpha export DEVTAG=tor-0.2.2.22-alpha Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-03-10 09:08:17 UTC (rev 24328) +++ website/trunk/include/versions.wmi 2011-03-10 09:16:44 UTC (rev 24329) @@ -28,7 +28,7 @@ <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.10</define-tag> -<define-tag version-torimbrowserbundle whitespace=delete>1.3.17</define-tag> +<define-tag version-torimbrowserbundle whitespace=delete>1.3.20</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.5</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.5</define-tag> Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-03-10 09:08:17 UTC (rev 24328) +++ website/trunk/publish 2011-03-10 09:16:44 UTC (rev 24329) @@ -5,7 +5,8 @@ make -j3 # don't copy over stuff with permissions that make it useless -chmod a+r * -R +#chmod a+r * -R +chmod -R a+r * rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update"

1 0

r24328: {website} bump package versions to tor-0.2.2.23-alpha (website/trunk/include)
by Erinn Clark 10 Mar '11

10 Mar '11

Author: erinn Date: 2011-03-10 09:08:17 +0000 (Thu, 10 Mar 2011) New Revision: 24328 Modified: website/trunk/include/versions.wmi Log: bump package versions to tor-0.2.2.23-alpha Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-03-09 18:57:30 UTC (rev 24327) +++ website/trunk/include/versions.wmi 2011-03-10 09:08:17 UTC (rev 24328) @@ -1,28 +1,28 @@ <define-tag version-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-alpha whitespace=delete>0.2.2.22-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.2.23-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.22-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.23-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.22-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.23-alpha</define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.22-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.23-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.22-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.23-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.22-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.23-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.22-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.23-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.18</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.20</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8p</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>3.6.13</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>3.6.15</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -30,17 +30,17 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.10</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.17</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.4</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.4</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.22-alpha</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.5</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.5</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.23-alpha</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8p</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.13</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.15</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.10</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.12</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.22-alpha</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.13</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.13</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.23-alpha</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.15</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>

1 0

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

09 Mar '11

commit 92e607d951c87bdc3e35d9bf3cfedcd0c39e9ae8 Merge: dc0bb6b 78d5955 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 16:22:50 2011 -0500 Merge remote branch 'origin/maint-0.2.2'

1 0

[tor/master] oops. I got the bug number wrong.
by nickm＠torproject.org 09 Mar '11

09 Mar '11

commit 78d5955e5beee201087fc9af19190c964fafaed7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 16:21:34 2011 -0500 oops. I got the bug number wrong. --- changes/bug2573 | 3 +++ changes/bug2574 | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug2573 b/changes/bug2573 new file mode 100644 index 0000000..7a2a802 --- /dev/null +++ b/changes/bug2573 @@ -0,0 +1,3 @@ + o Minor packaging issues + - Create the /var/run/tor directory on startup on OpenSUSE if it is + not already created. Patch from Andreas Stieger. Fixes bug 2573. diff --git a/changes/bug2574 b/changes/bug2574 deleted file mode 100644 index 7022749..0000000 --- a/changes/bug2574 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor packaging issues - - Create the /var/run/tor directory on startup on OpenSUSE if it is - not already created. Patch from Andreas Stieger. Fixes bug 2574.

1 0

[tor/maint-0.2.2] oops. I got the bug number wrong.
by nickm＠torproject.org 09 Mar '11

09 Mar '11

commit 78d5955e5beee201087fc9af19190c964fafaed7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 16:21:34 2011 -0500 oops. I got the bug number wrong. --- changes/bug2573 | 3 +++ changes/bug2574 | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug2573 b/changes/bug2573 new file mode 100644 index 0000000..7a2a802 --- /dev/null +++ b/changes/bug2573 @@ -0,0 +1,3 @@ + o Minor packaging issues + - Create the /var/run/tor directory on startup on OpenSUSE if it is + not already created. Patch from Andreas Stieger. Fixes bug 2573. diff --git a/changes/bug2574 b/changes/bug2574 deleted file mode 100644 index 7022749..0000000 --- a/changes/bug2574 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor packaging issues - - Create the /var/run/tor directory on startup on OpenSUSE if it is - not already created. Patch from Andreas Stieger. Fixes bug 2574.

1 0

[tor/master] oops. I got the bug number wrong.
by nickm＠torproject.org 09 Mar '11

09 Mar '11

commit dc0bb6b7094bdf5d11b8d9993f57506f5516787c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 16:21:34 2011 -0500 oops. I got the bug number wrong. --- changes/bug2573 | 3 +++ changes/bug2574 | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug2573 b/changes/bug2573 new file mode 100644 index 0000000..7a2a802 --- /dev/null +++ b/changes/bug2573 @@ -0,0 +1,3 @@ + o Minor packaging issues + - Create the /var/run/tor directory on startup on OpenSUSE if it is + not already created. Patch from Andreas Stieger. Fixes bug 2573. diff --git a/changes/bug2574 b/changes/bug2574 deleted file mode 100644 index 7022749..0000000 --- a/changes/bug2574 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor packaging issues - - Create the /var/run/tor directory on startup on OpenSUSE if it is - not already created. Patch from Andreas Stieger. Fixes bug 2574.

1 0