- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Add a step to the release process: tell trac about the version.
by nickm＠torproject.org 10 Mar '11

10 Mar '11

commit 48c4d532814ae4fdbf07635e57911bdf0e962b75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 10 16:10:53 2011 -0500 Add a step to the release process: tell trac about the version. --- doc/HACKING | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 32cea99..b612953 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -442,7 +442,14 @@ the website. 9) Email Erinn and weasel (cc'ing tor-assistants) that a new tarball is up. This step should probably change to mailing more packagers. -10) Wait up to a day or two (for a development release), or until most +10) Add the version number to Trac. To do this, go to Trac, log in, +select "Admin" near the top of the screen, then select "Versions" from +the menu on the left. At the right, there will be an "Add version" +box. By convention, we enter the version in the form "Tor: +0.2.2.23-alpha" (or whatever the version is), and we select the date as +the date in the ChangeLog. + +11) Wait up to a day or two (for a development release), or until most packages are up (for a stable release), and mail the release blurb and changelog to tor-talk or tor-announce.

1 0

r24333: {website} change some activity levels (website/trunk/getinvolved/en)
by Roger Dingledine 10 Mar '11

10 Mar '11

Author: arma Date: 2011-03-10 20:56:23 +0000 (Thu, 10 Mar 2011) New Revision: 24333 Modified: website/trunk/getinvolved/en/volunteer.wml Log: change some activity levels Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2011-03-10 19:58:49 UTC (rev 24332) +++ website/trunk/getinvolved/en/volunteer.wml 2011-03-10 20:56:23 UTC (rev 24333) @@ -155,7 +155,7 @@ <td><a href="#project-orbot">Orbot</a></td> <td>User Interface</td> <td>Java</td> - <td>Light</td> + <td>Moderate</td> <td>n8fr8</td> </tr> @@ -211,7 +211,7 @@ <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> - <td>None</td> + <td>Light</td> <td>kaner</td> </tr> @@ -227,7 +227,7 @@ <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> - <td>None</td> + <td>Moderate</td> <td>kaner, nickm</td> </tr> @@ -235,7 +235,7 @@ <td><a href="#project-torflow">TorFlow</a></td> <td>Backend Service</td> <td>Python</td> - <td>None</td> + <td>Light</td> <td>mikeperry</td> </tr> @@ -405,7 +405,7 @@ Project Ideas: - <a href="#orbotDevelopment">More on Orbot & Android OS-specific development</a> + <a href="#orbotDevelopment">More on Orbot & Android OS-specific development</a> <a id="project-torbutton"></a>

1 0

r24332: {website} get rid of a stray / (website/trunk/about/en)
by Roger Dingledine 10 Mar '11

10 Mar '11

Author: arma Date: 2011-03-10 19:58:49 +0000 (Thu, 10 Mar 2011) New Revision: 24332 Modified: website/trunk/about/en/gsoc.wml Log: get rid of a stray / Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2011-03-10 16:25:43 UTC (rev 24331) +++ website/trunk/about/en/gsoc.wml 2011-03-10 19:58:49 UTC (rev 24332) @@ -20,7 +20,7 @@ 2007</a>, <a href="http://code.google.com/soc/2008/eff/about.html">2008</a>, <a href="http://socghop.appspot.com/gsoc/org/home/google/gsoc2009/eff">2009</a>, - and <a href="<blog>/tor-google-summer-code-2010">2010</a>. + and <a href="<blog>tor-google-summer-code-2010">2010</a>. In total we had 21 students as full-time developers for the summers of 2007 to 2010. Now we are applying to <a href="https://socghop.appspot.com/gsoc/program/home/google/gsoc2011">Google

1 0

r24331: {} Add my presentation to sverige utrikesdepartementet. (in projects/presentations: . images)
by Andrew Lewman 10 Mar '11

10 Mar '11

Author: phobos Date: 2011-03-10 16:25:43 +0000 (Thu, 10 Mar 2011) New Revision: 24331 Added: projects/presentations/2011-03-10-sverige-utrikesdepartementet-10-minutes.pdf projects/presentations/2011-03-10-sverige-utrikesdepartementet-10-minutes.tex projects/presentations/images/direct-users-2011-03-09-72-eg-2010-12-09.png projects/presentations/images/direct-users-2011-03-09-72-ir-2010-12-09.png projects/presentations/images/direct-users-2011-03-09-72-ly-2010-12-09.png projects/presentations/images/direct-users-2011-03-09-72-tn-2010-12-09.png Log: Add my presentation to sverige utrikesdepartementet. Added: projects/presentations/2011-03-10-sverige-utrikesdepartementet-10-minutes.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2011-03-10-sverige-utrikesdepartementet-10-minutes.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/2011-03-10-sverige-utrikesdepartementet-10-minutes.tex =================================================================== --- projects/presentations/2011-03-10-sverige-utrikesdepartementet-10-minutes.tex (rev 0) +++ projects/presentations/2011-03-10-sverige-utrikesdepartementet-10-minutes.tex 2011-03-10 16:25:43 UTC (rev 24331) @@ -0,0 +1,47 @@ +\documentclass{beamer} +\mode<presentation> +\usetheme{Boadilla} +\title{Six Easy Pieces} +\author{Andrew Lewman \\ andrew(a)torproject.org} +\date{10 March 2011} +\begin{document} + +\begin{frame} +\maketitle +\begin{center} +\includegraphics[height=3cm]{./images/2009-tor-logo} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{} +\begin{Huge} +\begin{enumerate} +\item Education \& Training +\pause \item Decentralized \& Centralized +\pause \item Funding +\pause \item Sustainability +\pause \item Research \& Development +\pause \item Community +\end{enumerate} +\end{Huge} +\end{frame} + +\begin{frame} +\frametitle{Tor usage in volatile times} +\includegraphics<1>[scale=0.6]{./images/direct-users-2011-03-09-72-eg-2010-12-09} +\includegraphics<2>[scale=0.6]{./images/direct-users-2011-03-09-72-ly-2010-12-09} +\includegraphics<3>[scale=0.6]{./images/direct-users-2011-03-09-72-tn-2010-12-09} +\includegraphics<4>[scale=0.6]{./images/direct-users-2011-03-09-72-ir-2010-12-09} +\end{frame} + +\begin{frame} +\frametitle{} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad The Net interprets censorship as damage and routes around it. +\end{quotation} +\flushright --- John Gilmore, 1993 +\flushleft +\end{frame} + +\end{document} \ No newline at end of file Property changes on: projects/presentations/2011-03-10-sverige-utrikesdepartementet-10-minutes.tex ___________________________________________________________________ Added: svn:mime-type + text/x-tex Added: projects/presentations/images/direct-users-2011-03-09-72-eg-2010-12-09.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-03-09-72-eg-2010-12-09.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/direct-users-2011-03-09-72-ir-2010-12-09.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-03-09-72-ir-2010-12-09.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/direct-users-2011-03-09-72-ly-2010-12-09.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-03-09-72-ly-2010-12-09.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/direct-users-2011-03-09-72-tn-2010-12-09.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/direct-users-2011-03-09-72-tn-2010-12-09.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

[metrics-tasks/master] Improve the README a bit.
by karsten＠torproject.org 10 Mar '11

10 Mar '11

commit 1230620020aaa351124208391e8bef6738e163a1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 10 17:02:12 2011 +0100 Improve the README a bit. --- README | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README b/README index f61426a..31820b9 100644 --- a/README +++ b/README @@ -12,14 +12,17 @@ The rules are simple: Java, R, Python code for metrics analyses, we create a new subdirectory here. The naming convention is simply that we use the ticket number that Trac assigns as subdirectory name. For example, code for ticket - #1234 should go in subdirectory 1234/. If there's no Trac ticket yet, - then why are you working on it? Go create a Trac ticket first! + #1234 should go in subdirectory task-1234/. If there's no Trac ticket + yet, then why are you working on it? Go create a Trac ticket first! - There should be a README file in every subdirectory saying what the code does, what libraries are required, and so on. Don't spend much time on writing a good README, but imagine that you might want to know what's going on in 3, 6, or 12 months. + - Don't check in binaries. We assume that whoever checks out code from + this repository knows how to download libraries and compile sources. + - If we open a follow-up ticket to a ticket that has code in this repository, we `git mv` the files and create a tiny text file in the original ticket directory saying where the code moved.

1 0

[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