- tor-commits - lists.torproject.org

[vidalia/master] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit cf25843b21052ecec631a7906530324f8f03f193 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:44:15 2012 -0300 Add a changes file --- changes/bug4724 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug4724 b/changes/bug4724 new file mode 100644 index 0000000..f2b3ccb --- /dev/null +++ b/changes/bug4724 @@ -0,0 +1,3 @@ + o Removes the option to have only HTTPProxy since it does not work + any more as it used to do with older tor versions. Users should + use HTTP/HTTPSProxy instead. Fixes bug 4724. \ No newline at end of file

1 0

[vidalia/master] Fix squeezing problem in ServerPage layout
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 3909ab46e2f732fcca162ff3ef468cd716c917c4 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 14:42:10 2012 -0300 Fix squeezing problem in ServerPage layout --- src/vidalia/config/ServerPage.ui | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui index cfb3251..0f98560 100644 --- a/src/vidalia/config/ServerPage.ui +++ b/src/vidalia/config/ServerPage.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>548</width> - <height>507</height> + <height>578</height> </rect> </property> <property name="contextMenuPolicy"> @@ -90,7 +90,7 @@ </sizepolicy> </property> <property name="currentIndex"> - <number>0</number> + <number>1</number> </property> <widget class="QWidget" name="ServerConfig"> <attribute name="title"> @@ -520,6 +520,12 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st </item> <item> <widget class="QFrame" name="frmCustomRate"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property>

1 0

[vidalia/master] Takes ownership of the tor process it controls
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 05e1bc589237ef9bf3a36cba08c1928b4da8889a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 12:03:53 2012 -0300 Takes ownership of the tor process it controls If Vidalia fails, tor won't be running in the background with a random hashed password. --- src/torcontrol/TorControl.cpp | 7 +++++++ src/torcontrol/TorControl.h | 3 +++ src/vidalia/MainWindow.cpp | 7 +++++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index af925a7..730e821 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -1127,3 +1127,10 @@ TorControl::ipToCountry(const QHostAddress &ip, QString *errmsg) return QString(); } +/** Takes ownership of the tor process it's communicating to */ +bool +TorControl::takeOwnership(QString *errmsg) +{ + ControlCommand cmd("TAKEOWNERSHIP"); + return send(cmd, errmsg); +} diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index f3504f5..c16758c 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -209,6 +209,9 @@ public: * it's not NULL. */ QString ipToCountry(const QHostAddress &ip, QString *errmsg = 0); + /** Takes ownership of the tor process it's communicating to */ + bool takeOwnership(QString *errmsg); + public slots: /** Closes the circuit specified by circId. If ifUnused is * true, then the circuit will not be closed unless it is unused. */ diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index a60509f..3148078 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1082,6 +1082,8 @@ MainWindow::start() QString path = settings.getSocketPath(); args << "ControlSocket" << path; } + + args << "__OwningControllerProcess" << QString::number(QCoreApplication::applicationPid()); /* Add the control port authentication arguments */ switch (settings.getAuthenticationMethod()) { @@ -1346,6 +1348,11 @@ void MainWindow::connected() { authenticate(); + if(!_torControl->isVidaliaRunningTor()) { + QString err; + if(!_torControl->takeOwnership(&err)) + vWarn(err); + } } /** Called when Vidalia wants to disconnect from a Tor it did not start. */

1 0

[vidalia/master] Merge branch 'bug4724_httpproxy_backport'
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit b3775aa1b6ad8c5f4a8328ec9cd746763fc06428 Merge: c1e7f60 cf25843 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 13:17:05 2012 -0300 Merge branch 'bug4724_httpproxy_backport' changes/bug4724 | 3 +++ src/vidalia/config/NetworkPage.cpp | 1 - src/vidalia/config/NetworkSettings.cpp | 12 ------------ src/vidalia/config/NetworkSettings.h | 5 ++--- 4 files changed, 5 insertions(+), 16 deletions(-)

1 0

r25335: {website} remove a mirror, update the mirror status page too. (in website/trunk: . include)
by Andrew Lewman 23 Jan '12

23 Jan '12

Author: phobos Date: 2012-01-23 15:56:17 +0000 (Mon, 23 Jan 2012) New Revision: 25335 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: remove a mirror, update the mirror status page too. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-01-23 07:23:57 UTC (rev 25334) +++ website/trunk/include/mirrors-table.wmi 2012-01-23 15:56:17 UTC (rev 25335) @@ -1,15 +1,15 @@ <tr> - <td>NL</td> + <td>IS</td> - <td>Amorphis</td> + <td>torproject.is</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.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -18,49 +18,49 @@ <tr> - <td>NL</td> + <td>AT</td> - <td>torproject.nl</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.nl/dist/">http</a></td> - <td><a href="http://www.torproject.nl/">http</a></td> - <td><a href="https://www.torproject.nl/dist/">https</a></td> - <td><a href="https://www.torproject.nl/">https</a></td> + <td><a href="http://torproject.ph3x.at/dist/">http</a></td> + <td><a href="http://torproject.ph3x.at/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>US</td> - <td>CCC</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> - <td>DK</td> + <td>AT</td> - <td>Zentrum der Gesundheit</td> + <td></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><a href="http://tor.dont-know-me.at/dist/">http</a></td> + <td><a href="http://tor.dont-know-me.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -69,32 +69,32 @@ <tr> - <td>EE</td> + <td>FR</td> - <td>CyberSIDE</td> + <td>BarkerJr</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><a href="http://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>IS</td> + <td>US</td> - <td>torproject.is</td> + <td>searchprivate</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://tor.searchprivate.com/dist/">http</a></td> + <td><a href="http://tor.searchprivate.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -103,49 +103,49 @@ <tr> - <td>AT</td> + <td>DE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.ph3x.at/dist/">http</a></td> - <td><a href="http://torproject.ph3x.at/">http</a></td> + <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>DE</td> - <td>BarkerJr</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>AT</td> + <td>HU</td> - <td></td> + <td>Unknown</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> - <td><a href="http://tor.dont-know-me.at/">http</a></td> + <td><a href="http://mirror.tor.hu/dist/">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -154,49 +154,49 @@ <tr> - <td>IS</td> + <td>DE</td> - <td>myRL.net</td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.myrl.net/dist/">http</a></td> - <td><a href="http://tor.myrl.net/">http</a></td> - <td><a href="https://tor.myrl.net/dist/">https</a></td> - <td><a href="https://tor.myrl.net/">https</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> - <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> <td>DE</td> - <td>CCC-Hanau</td> + <td>borgmann.tv</td> <td>Up to date</td> - <td><a href="ftp://key-server.org/tor">ftp</a></td> - <td><a href="http://tor.key-server.org/dist/">http</a></td> - <td><a href="http://tor.key-server.org/">http</a></td> - <td><a href="https://tor.key-server.org/dist/">https</a></td> - <td><a href="https://tor.key-server.org/">https</a></td> <td> - </td> + <td><a href="http://tor.borgmann.tv/dist/">http</a></td> + <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>LT</td> + <td>IL</td> - <td></td> + <td>Host4site</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><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -205,49 +205,49 @@ <tr> - <td>FR</td> + <td>DE</td> - <td>BarkerJr</td> + <td>spline</td> <td>Up to date</td> + <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> + <td><a href="http://tor.spline.de/dist/">http</a></td> + <td><a href="http://tor.spline.de/">http</a></td> <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> <td> - </td> + <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> </tr> <tr> - <td>AT</td> + <td>GB</td> - <td>cyberarmy</td> + <td>torland</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist/">http</a></td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> + <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>IS</td> - <td>searchprivate</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist/">http</a></td> - <td><a href="http://tor.searchprivate.com/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -256,49 +256,49 @@ <tr> - <td>DE</td> + <td>INT</td> - <td></td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></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>factor.cc</td> + <td>torproject.nl</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> + <td><a href="http://www.torproject.nl/dist/">http</a></td> + <td><a href="http://www.torproject.nl/">http</a></td> + <td><a href="https://www.torproject.nl/dist/">https</a></td> + <td><a href="https://www.torproject.nl/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>chaos darmstadt</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -307,15 +307,15 @@ <tr> - <td>HU</td> + <td>EE</td> - <td>Unknown</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.tor.hu/dist/">http</a></td> - <td><a href="http://mirror.tor.hu/">http</a></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> @@ -324,32 +324,32 @@ <tr> - <td>DE</td> + <td>IS</td> - <td>beme it</td> + <td>myRL.net</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="http://tor.myrl.net/dist/">http</a></td> + <td><a href="http://tor.myrl.net/">http</a></td> + <td><a href="https://tor.myrl.net/dist/">https</a></td> + <td><a href="https://tor.myrl.net/">https</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>AT</td> - <td>borgmann.tv</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.borgmann.tv/dist/">http</a></td> - <td><a href="http://tor.borgmann.tv/">http</a></td> + <td><a href="http://tor.cyberarmy.at/dist/">http</a></td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,68 +358,68 @@ <tr> - <td>IL</td> + <td>DE</td> - <td>Host4site</td> + <td>factor.cc</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>FR</td> + <td>US</td> - <td>LazyTiger</td> + <td>Xpdm</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>FR</td> - <td>spline</td> + <td>LazyTiger</td> <td>Up to date</td> - <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> - <td><a href="http://tor.spline.de/dist/">http</a></td> - <td><a href="http://tor.spline.de/">http</a></td> <td> - </td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> - <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>GB</td> + <td>DE</td> - <td>torland</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> - <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.torland.me/torproject.org/">https</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> @@ -428,30 +428,30 @@ <td>IS</td> - <td>TheOnionRouter</td> + <td>crypto.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">http</a></td> + <td><a href="https://torproject.crypto.is/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">https</a></td> + <td><a href="https://torproject.crypto.is/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>SE</td> + <td>LT</td> - <td>homosu</td> + <td></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.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -460,32 +460,32 @@ <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> @@ -494,19 +494,19 @@ <tr> - <td>IS</td> + <td>SE</td> - <td>crypto.is</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="https://torproject.crypto.is/dist/">http</a></td> - <td><a href="https://torproject.crypto.is/">http</a></td> - <td><a href="https://torproject.crypto.is/dist/">https</a></td> - <td><a href="https://torproject.crypto.is/">https</a></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> @@ -712,20 +712,3 @@ <td> - </td> <td> - </td> </tr> - -<tr> - - <td>US</td> - - <td>Xpdm</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> - <td> - </td> - <td> - </td> -</tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-01-23 07:23:57 UTC (rev 25334) +++ website/trunk/update-mirrors.pl 2012-01-23 15:56:17 UTC (rev 25335) @@ -606,24 +606,6 @@ rsyncDistMirror => "", hiddenServiceMirror => "", }, - mirror039 => { - adminContact => "", - orgName => "CCC-Hanau", - isoCC => "DE", - subRegion => "", - region => "DE", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "No", - httpWebsiteMirror => "http://tor.key-server.org/", - httpsWebsiteMirror => "https://tor.key-server.org/", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "ftp://key-server.org/tor", - httpDistMirror => "http://tor.key-server.org/dist/", - httpsDistMirror => "https://tor.key-server.org/dist/", - rsyncDistMirror => "", - hiddenServiceMirror => "", - }, mirror040 => { adminContact => "", orgName => "",

1 0

[metrics-tasks/master] Update #4686 graphing code.
by karsten＠torproject.org 23 Jan '12

23 Jan '12

commit 895f005b1dd7ab73ca8b92c777f9d890c074e870 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 23 11:52:08 2012 +0100 Update #4686 graphing code. --- task-4686/.gitignore | 4 ++-- task-4686/download-stats.R | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/task-4686/.gitignore b/task-4686/.gitignore index 23b548f..2691567 100644 --- a/task-4686/.gitignore +++ b/task-4686/.gitignore @@ -1,4 +1,4 @@ Rplots.pdf -download-stats.csv -download-stats.png +*.csv +*.png diff --git a/task-4686/download-stats.R b/task-4686/download-stats.R index bdc599c..bd4f065 100644 --- a/task-4686/download-stats.R +++ b/task-4686/download-stats.R @@ -1,13 +1,21 @@ library(ggplot2) -d <- read.csv("download-stats.csv", header = FALSE, + +u <- read.csv("download-stats-usa.csv", header = FALSE, + col.names = c("dirauth", "download", "seconds")) +e <- read.csv("download-stats-europe.csv", header = FALSE, col.names = c("dirauth", "download", "seconds")) +d <- rbind( + data.frame(u, host = "U.S.A."), + data.frame(e, host = "Europe")) +d <- d[d$download >= min(e$download), ] ggplot(d, aes(x = as.POSIXct(download / 1000, - origin = "1970-01-01 00:00:00"), y = seconds / 1000)) + + origin = "1970-01-01 00:00:00"), y = seconds / 1000, colour = host)) + geom_point(alpha = 0.25) + facet_wrap(~ dirauth) + -scale_x_datetime(name = "", major = "1 month", minor = "1 week", - format = "%b %d, %Y") + +scale_x_datetime(name = "", major = "1 week", minor = "1 day", + format = "%b %d") + scale_y_continuous(name = "", limits = c(0, max(d$seconds) / 1000)) + +scale_colour_hue(name = "") + opts(title = "Consensus download times in seconds\n") -ggsave("download-stats.png", width = 8, height = 6, dpi = 100) +ggsave("download-stats-comparison.png", width = 8, height = 6, dpi = 100)

1 0

[metrics-web/master] Update formats.html to say how we sanitize IPv6 addresses.
by karsten＠torproject.org 23 Jan '12

23 Jan '12

commit 9e80554d4a61eb983956671883114cf689639db7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 23 11:12:29 2012 +0100 Update formats.html to say how we sanitize IPv6 addresses. --- web/WEB-INF/formats.jsp | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index bf2cb36..9bd39cf 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -289,10 +289,11 @@ public key. Replacing keys by newly generated ones seemed to be unnecessary (and would involve keeping a state over months/years), so that all cryptographic objects have simply been removed.</li> -<li>Replace IP address with IP address hash: Of course, the IP -address needs to be removed, too. -It is replaced with <tt>10.x.x.x</tt> with <tt>x.x.x</tt> being the 3 byte -output of <tt>H(IP address | bridge identity | secret)[:3]</tt>. +<li>Replace IP address with IP address hash: Of course, IP +addresses need to be sanitized, too. +<ul><li>IPv4 addresses are replaced with <tt>10.x.x.x</tt> with +<tt>x.x.x</tt> being the 3 byte output of +<tt>H(IP address | bridge identity | secret)[:3]</tt>. The input <tt>IP address</tt> is the 4-byte long binary representation of the bridge's current IP address. The <tt>bridge identity</tt> is the 20-byte long binary representation of @@ -302,6 +303,11 @@ per month for all descriptors and statuses published in that month. <tt>H()</tt> is SHA-256. The <tt>[:3]</tt> operator means that we pick the 3 most significant bytes of the result.</li> +<li>IPv6 addresses are replaced with <tt>[fd9f:2e19:3bcf::xx:xxxx]</tt> +with <tt>xx:xxxx</tt> being the hex-formatted 3 byte output of a similar +hash function as described for IPv4 addresses. +The only differences are that the input <tt>IP address</tt> is 16 bytes +long and the <tt>secret</tt> is only 19 bytes long.</li></ul> <li>Replace contact information: If there is contact information in a descriptor, the contact line is changed to <tt>somebody</tt>.</li>

1 0

[metrics-db/master] Fix typo in the bridge descriptor sanitizer.
by karsten＠torproject.org 23 Jan '12

23 Jan '12

commit 4cacf7e8f1f9c31f9638986909a8b4095804cc24 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 23 10:56:17 2012 +0100 Fix typo in the bridge descriptor sanitizer. --- .../ernie/db/SanitizedBridgesWriter.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index 7e3055c..d2f2a02 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -330,7 +330,7 @@ public class SanitizedBridgesWriter { scrubbedAddressPart = this.scrubIpv6Address(addressPart, fingerprintBytes, published); } else { - scrubbedAddressPart = this.scrubIpv6Address(addressPart, + scrubbedAddressPart = this.scrubIpv4Address(addressPart, fingerprintBytes, published); } return (scrubbedAddressPart == null ? null :

1 0

[metrics-lib/master] Let Eclipse organize imports.
by karsten＠torproject.org 23 Jan '12

23 Jan '12

commit b0ad6350dfa2c1e05d7e5138b2c982f7f7c2e39a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 23 10:12:49 2012 +0100 Let Eclipse organize imports. --- .../descriptor/impl/DirectoryDownloader.java | 1 - .../descriptor/impl/DownloadCoordinatorImpl.java | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/org/torproject/descriptor/impl/DirectoryDownloader.java index b6d9b05..7b4311c 100644 --- a/src/org/torproject/descriptor/impl/DirectoryDownloader.java +++ b/src/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -4,7 +4,6 @@ package org.torproject.descriptor.impl; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.util.zip.InflaterInputStream; diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java index 0c0ebc3..273655e 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java @@ -2,11 +2,9 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; -import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.SortedMap; @@ -15,7 +13,6 @@ import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorRequest; import org.torproject.descriptor.DirSourceEntry; import org.torproject.descriptor.RelayNetworkStatusConsensus; -import org.torproject.descriptor.RelayNetworkStatusVote; /* TODO This whole download logic is a mess and needs a cleanup. */ public class DownloadCoordinatorImpl implements DownloadCoordinator {

1 0

[metrics-lib/master] Add basic support for or-address lines.
by karsten＠torproject.org 23 Jan '12

23 Jan '12

commit 1679980f9f7f9b2ed4e75a7f6feb267d9c4190c7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 23 10:11:27 2012 +0100 Add basic support for or-address lines. --- .../torproject/descriptor/NetworkStatusEntry.java | 6 +++++ .../torproject/descriptor/ServerDescriptor.java | 5 ++++ .../descriptor/impl/NetworkStatusEntryImpl.java | 22 +++++++++++++++++++- .../descriptor/impl/ServerDescriptorImpl.java | 18 ++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/NetworkStatusEntry.java b/src/org/torproject/descriptor/NetworkStatusEntry.java index 38b7862..ba5939c 100644 --- a/src/org/torproject/descriptor/NetworkStatusEntry.java +++ b/src/org/torproject/descriptor/NetworkStatusEntry.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.descriptor; +import java.util.List; import java.util.SortedSet; public interface NetworkStatusEntry { @@ -30,6 +31,11 @@ public interface NetworkStatusEntry { /* Return the DirPort. */ public int getDirPort(); + /* Return the relay's additional OR addresses and ports contained in + * or-address lines, or an empty list if the network status doesn't + * contain such lines. */ + public List<String> getOrAddresses(); + /* Return the relay flags or null if the status entry didn't contain any * relay flags. */ public SortedSet<String> getFlags(); diff --git a/src/org/torproject/descriptor/ServerDescriptor.java b/src/org/torproject/descriptor/ServerDescriptor.java index 631779e..2aa9364 100644 --- a/src/org/torproject/descriptor/ServerDescriptor.java +++ b/src/org/torproject/descriptor/ServerDescriptor.java @@ -22,6 +22,11 @@ public interface ServerDescriptor extends Descriptor { /* Return the relay's directory port. */ public int getDirPort(); + /* Return the relay's additional OR addresses and ports contained in + * or-address lines, or an empty list if the descriptor doesn't contain + * such lines. */ + public List<String> getOrAddresses(); + /* Return the average bandwidth in bytes per second that the relay is * willing to sustain over long periods. */ public int getBandwidthRate(); diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index ef122fe..ce235ab 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -5,6 +5,8 @@ package org.torproject.descriptor.impl; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeSet; @@ -59,7 +61,9 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { String[] parts = !line.startsWith("opt ") ? line.split(" ") : line.substring("opt ".length()).split(" "); String keyword = parts[0]; - if (keyword.equals("s")) { + if (keyword.equals("a")) { + this.parseALine(line, parts); + } else if (keyword.equals("s")) { this.parseSLine(line, parts); } else if (keyword.equals("v")) { this.parseVLine(line, parts); @@ -102,6 +106,17 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { this.dirPort = ParseHelper.parsePort(line, parts[8]); } + private void parseALine(String line, String[] parts) + throws DescriptorParseException { + if (parts.length != 2) { + throw new DescriptorParseException("Invalid line '" + line + "' in " + + "status entry."); + } + /* TODO Add more checks. */ + /* TODO Add tests. */ + this.orAddresses.add(parts[1]); + } + private void parseSLine(String line, String[] parts) throws DescriptorParseException { this.parsedAtMostOnceKeyword("s"); @@ -212,6 +227,11 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { return this.dirPort; } + private List<String> orAddresses = new ArrayList<String>(); + public List<String> getOrAddresses() { + return new ArrayList<String>(this.orAddresses); + } + private SortedSet<String> flags; public SortedSet<String> getFlags() { return new TreeSet<String>(this.flags); diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 47e6166..09e9123 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -78,6 +78,8 @@ public class ServerDescriptorImpl extends DescriptorImpl String keyword = partsNoOpt[0]; if (keyword.equals("router")) { this.parseRouterLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("or-address")) { + this.parseOrAddressLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("bandwidth")) { this.parseBandwidthLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("platform")) { @@ -154,6 +156,17 @@ public class ServerDescriptorImpl extends DescriptorImpl this.dirPort = ParseHelper.parsePort(line, partsNoOpt[5]); } + private void parseOrAddressLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length != 2) { + throw new DescriptorParseException("Wrong number of values in line " + + "'" + line + "'."); + } + /* TODO Add more checks. */ + /* TODO Add tests. */ + this.orAddresses.add(partsNoOpt[1]); + } + private void parseBandwidthLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (partsNoOpt.length != 4) { @@ -432,6 +445,11 @@ public class ServerDescriptorImpl extends DescriptorImpl return this.dirPort; } + private List<String> orAddresses = new ArrayList<String>(); + public List<String> getOrAddresses() { + return new ArrayList<String>(this.orAddresses); + } + private int bandwidthRate; public int getBandwidthRate() { return this.bandwidthRate;

1 0