- tor-commits - lists.torproject.org

[vidalia/alpha] Merge branch 'master' into alpha
by chiiph＠torproject.org 05 May '11

05 May '11

commit b375385dae45ee9e3eeb5d030923f7906ca5bcf1 Merge: ff19c25 bc83c37 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu May 5 20:13:09 2011 +0100 Merge branch 'master' into alpha src/vidalia/help/content/po/templates/links.pot | 108 ++++++++++------------- 1 files changed, 47 insertions(+), 61 deletions(-)

1 0

[vidalia/alpha] Updated links.pot from links.html
by chiiph＠torproject.org 05 May '11

05 May '11

commit bc83c37be03ef47b61d178a3b91b75d5c281a2e7 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu May 5 20:06:37 2011 +0100 Updated links.pot from links.html --- src/vidalia/help/content/po/templates/links.pot | 108 ++++++++++------------- 1 files changed, 47 insertions(+), 61 deletions(-) diff --git a/src/vidalia/help/content/po/templates/links.pot b/src/vidalia/help/content/po/templates/links.pot index c9580ad..953242a 100644 --- a/src/vidalia/help/content/po/templates/links.pot +++ b/src/vidalia/help/content/po/templates/links.pot @@ -5,8 +5,8 @@ ## the LICENSE file, found in the top level directory of this ## distribution. If you did not receive the LICENSE file with this ## file, you may obtain it from the Vidalia source package distributed -## by the Vidalia Project at http://www.vidalia-project.net/. No part -## of Vidalia, including this file, may be copied, modified, +## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html. +## No part of Vidalia, including this file, may be copied, modified, ## propagated, or distributed except according to the terms described ## in the LICENSE file. ## @@ -14,97 +14,83 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-06-26 16:59+0200\n" +"POT-Creation-Date: 2011-05-05 20:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" -#. type: Content of: <html><body><h1> -#: en/links.html:16 +#. type: h1 +#: FIXME:0 +#, no-wrap msgid "Helpful Links" msgstr "" -#. type: Content of: <html><body><h3> -#: en/links.html:19 +#. type: h3 +#: FIXME:0 +#, no-wrap msgid "Vidalia" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73 +#. type: td +#: FIXME:0 FIXME:0 FIXME:0 FIXME:0 FIXME:0 +#, no-wrap msgid "   " msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:23 en/links.html:51 +#. type: td +#: FIXME:0 FIXME:0 +#, no-wrap msgid "Homepage" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:25 -msgid "" -"<a href=\"https://www.torproject.org/vidalia/\"> " -"https://www.torproject.org/vidalia/</a>" -msgstr "" - -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:31 en/links.html:66 -msgid "Wiki" -msgstr "" - -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:33 -msgid "" -"<a href=\"http://trac.vidalia-project.net/wiki\"> " -"http://trac.vidalia-project.net/wiki</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "https://www.torproject.org/vidalia/" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:39 en/links.html:74 -msgid "Bugtracker" +#. type: td +#: FIXME:0 FIXME:0 +#, no-wrap +msgid "Wiki and Bugtracker" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:41 -msgid "" -"<a href=\"http://trac.vidalia-project.net/report\"> " -"http://trac.vidalia-project.net/report</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "http://trac.torproject.org/" msgstr "" -#. type: Content of: <html><body><h3> -#: en/links.html:47 +#. type: h3 +#: FIXME:0 +#, no-wrap msgid "Tor" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:53 -msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "https://www.torproject.org/" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:58 +#. type: td +#: FIXME:0 +#, no-wrap msgid "FAQ" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:60 -msgid "" -"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> " -"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>" -msgstr "" - -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:68 -msgid "" -"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> " -"https://wiki.torproject.org/noreply/TheOnionRouter</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "https://www.torproject.org/docs/faq.html" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:76 -msgid "" -"<a href=\"https://bugs.torproject.org/flyspray/\"> " -"https://bugs.torproject.org/flyspray</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "https://trac.torproject.org/" msgstr ""

1 0

[vidalia/alpha] tell po4a it is xhtml and not html to avoid weird FIXME comments
by chiiph＠torproject.org 05 May '11

05 May '11

commit fd477fccc169a5cf298778f45da41f22f3e048d9 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu May 5 20:19:21 2011 +0100 tell po4a it is xhtml and not html to avoid weird FIXME comments --- src/vidalia/help/content/po/templates/links.pot | 58 +++++++++++----------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/vidalia/help/content/po/templates/links.pot b/src/vidalia/help/content/po/templates/links.pot index 953242a..66fa74e 100644 --- a/src/vidalia/help/content/po/templates/links.pot +++ b/src/vidalia/help/content/po/templates/links.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-05-05 20:03+0200\n" +"POT-Creation-Date: 2011-05-05 20:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -23,74 +23,74 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. type: h1 -#: FIXME:0 +#. type: Content of: <html><body><h1> +#: links.html:16 #, no-wrap msgid "Helpful Links" msgstr "" -#. type: h3 -#: FIXME:0 +#. type: Content of: <html><body><h3> +#: links.html:19 #, no-wrap msgid "Vidalia" msgstr "" -#. type: td -#: FIXME:0 FIXME:0 FIXME:0 FIXME:0 FIXME:0 +#. type: Content of: <html><body><table><tr><td> +#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 #, no-wrap msgid "   " msgstr "" -#. type: td -#: FIXME:0 FIXME:0 +#. type: Content of: <html><body><table><tr><td> +#: links.html:23 links.html:43 #, no-wrap msgid "Homepage" msgstr "" -#. type: a -#: FIXME:0 +#. type: Content of: <html><body><table><tr><td><a> +#: links.html:26 #, no-wrap -msgid "https://www.torproject.org/vidalia/" +msgid " https://www.torproject.org/vidalia/" msgstr "" -#. type: td -#: FIXME:0 FIXME:0 +#. type: Content of: <html><body><table><tr><td> +#: links.html:31 links.html:58 #, no-wrap msgid "Wiki and Bugtracker" msgstr "" -#. type: a -#: FIXME:0 +#. type: Content of: <html><body><table><tr><td><a> +#: links.html:34 #, no-wrap -msgid "http://trac.torproject.org/" +msgid " http://trac.torproject.org/" msgstr "" -#. type: h3 -#: FIXME:0 +#. type: Content of: <html><body><h3> +#: links.html:39 #, no-wrap msgid "Tor" msgstr "" -#. type: a -#: FIXME:0 +#. type: Content of: <html><body><table><tr><td><a> +#: links.html:45 #, no-wrap msgid "https://www.torproject.org/" msgstr "" -#. type: td -#: FIXME:0 +#. type: Content of: <html><body><table><tr><td> +#: links.html:50 #, no-wrap msgid "FAQ" msgstr "" -#. type: a -#: FIXME:0 +#. type: Content of: <html><body><table><tr><td><a> +#: links.html:53 #, no-wrap -msgid "https://www.torproject.org/docs/faq.html" +msgid " https://www.torproject.org/docs/faq.html" msgstr "" -#. type: a -#: FIXME:0 +#. type: Content of: <html><body><table><tr><td><a> +#: links.html:61 #, no-wrap -msgid "https://trac.torproject.org/" +msgid " https://trac.torproject.org/" msgstr ""

1 0

[vidalia/alpha] Merge remote-tracking branch 'runa/alpha' into alpha
by chiiph＠torproject.org 05 May '11

05 May '11

commit 51938355e973130042fb3f81320c8738ee81ba0e Merge: f9d789e fd477fc Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu May 5 16:24:55 2011 -0300 Merge remote-tracking branch 'runa/alpha' into alpha src/vidalia/help/content/po/templates/links.pot | 94 ++++++++++------------- 1 files changed, 40 insertions(+), 54 deletions(-)

1 0

[vidalia/master] Use minimum bandwidth
by chiiph＠torproject.org 05 May '11

05 May '11

commit 9adaff9833062acc773ab446d6becd3dc08bf8e6 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Sat Apr 30 17:14:18 2011 -0300 Use minimum bandwidth --- src/vidalia/network/RouterDescriptorView.cpp | 5 ++++- src/vidalia/network/RouterListItem.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp index 63c3102..ab94889 100644 --- a/src/vidalia/network/RouterDescriptorView.cpp +++ b/src/vidalia/network/RouterDescriptorView.cpp @@ -110,8 +110,11 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist) /* If the router is online, then show the uptime and bandwidth stats. */ if (!rd.offline()) { + qint64 minBandwidth = (qint64)qMin(rd.observedBandwidth(), + qMin(rd.averageBandwidth(), + rd.burstBandwidth())); html.append(trow(tcol(b(tr("Bandwidth:"))) + - tcol(string_format_bandwidth(rd.observedBandwidth())))); + tcol(string_format_bandwidth(minBandwidth)))); html.append(trow(tcol(b(tr("Uptime:"))) + tcol(string_format_uptime( adjustUptime(rd.uptime(), rd.published()))))); diff --git a/src/vidalia/network/RouterListItem.cpp b/src/vidalia/network/RouterListItem.cpp index 904a3f7..f0bdcad 100644 --- a/src/vidalia/network/RouterListItem.cpp +++ b/src/vidalia/network/RouterListItem.cpp @@ -69,7 +69,9 @@ RouterListItem::update(const RouterDescriptor &rd) statusIcon = QIcon(IMG_NODE_SLEEPING); setToolTip(STATUS_COLUMN, tr("Hibernating")); } else { - _statusValue = (qint64)_rd->observedBandwidth(); + _statusValue = (qint64)qMin(_rd->observedBandwidth(), + qMin(_rd->averageBandwidth(), + _rd->burstBandwidth())); if (_statusValue >= 400*1024) { statusIcon = QIcon(IMG_NODE_HIGH_BW); } else if (_statusValue >= 60*1024) {

1 0

[vidalia/master] Merge branch 'bug2744_bandwidth'
by chiiph＠torproject.org 05 May '11

05 May '11

commit 1334480dc306064ecc7bf9adadec0afeac36b2cf Merge: 7b01d6c 9adaff9 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu May 5 15:55:52 2011 -0300 Merge branch 'bug2744_bandwidth' src/vidalia/network/RouterDescriptorView.cpp | 5 ++++- src/vidalia/network/RouterListItem.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[vidalia/master] tell po4a it is xhtml and not html to avoid weird FIXME comments
by chiiph＠torproject.org 05 May '11

05 May '11

commit 489273067befeec911a2bb02f75d7141d9aa0d7c Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu May 5 20:23:43 2011 +0100 tell po4a it is xhtml and not html to avoid weird FIXME comments --- src/vidalia/help/content/po/templates/links.pot | 76 ++++++++++------------- 1 files changed, 34 insertions(+), 42 deletions(-) diff --git a/src/vidalia/help/content/po/templates/links.pot b/src/vidalia/help/content/po/templates/links.pot index 953242a..a1d0a8d 100644 --- a/src/vidalia/help/content/po/templates/links.pot +++ b/src/vidalia/help/content/po/templates/links.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-05-05 20:03+0200\n" +"POT-Creation-Date: 2011-05-05 20:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -23,74 +23,66 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. type: h1 -#: FIXME:0 -#, no-wrap +#. type: Content of: <html><body><h1> +#: links.html:16 msgid "Helpful Links" msgstr "" -#. type: h3 -#: FIXME:0 -#, no-wrap +#. type: Content of: <html><body><h3> +#: links.html:19 msgid "Vidalia" msgstr "" -#. type: td -#: FIXME:0 FIXME:0 FIXME:0 FIXME:0 FIXME:0 -#, no-wrap +#. type: Content of: <html><body><table><tr><td> +#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 msgid "   " msgstr "" -#. type: td -#: FIXME:0 FIXME:0 -#, no-wrap +#. type: Content of: <html><body><table><tr><td> +#: links.html:23 links.html:43 msgid "Homepage" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "https://www.torproject.org/vidalia/" +#. type: Content of: <html><body><table><tr><td> +#: links.html:25 +msgid "" +"<a href=\"https://www.torproject.org/vidalia/\"> " +"https://www.torproject.org/vidalia/</a>" msgstr "" -#. type: td -#: FIXME:0 FIXME:0 -#, no-wrap +#. type: Content of: <html><body><table><tr><td> +#: links.html:31 links.html:58 msgid "Wiki and Bugtracker" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "http://trac.torproject.org/" +#. type: Content of: <html><body><table><tr><td> +#: links.html:33 +msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" msgstr "" -#. type: h3 -#: FIXME:0 -#, no-wrap +#. type: Content of: <html><body><h3> +#: links.html:39 msgid "Tor" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "https://www.torproject.org/" +#. type: Content of: <html><body><table><tr><td> +#: links.html:45 +msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" msgstr "" -#. type: td -#: FIXME:0 -#, no-wrap +#. type: Content of: <html><body><table><tr><td> +#: links.html:50 msgid "FAQ" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "https://www.torproject.org/docs/faq.html" +#. type: Content of: <html><body><table><tr><td> +#: links.html:52 +msgid "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "https://trac.torproject.org/" +#. type: Content of: <html><body><table><tr><td> +#: links.html:60 +msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" msgstr ""

1 0

[vidalia/master] Merge remote-tracking branch 'runa/master'
by chiiph＠torproject.org 05 May '11

05 May '11

commit 342d88c9c1c80949b1cd3fa77371f75b571e19d9 Merge: 1334480 4892730 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu May 5 16:24:49 2011 -0300 Merge remote-tracking branch 'runa/master' src/vidalia/help/content/po/templates/links.pot | 66 ++++++++--------------- 1 files changed, 22 insertions(+), 44 deletions(-)

1 0

[vidalia/master] Updated links.pot from links.html
by chiiph＠torproject.org 05 May '11

05 May '11

commit bc83c37be03ef47b61d178a3b91b75d5c281a2e7 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu May 5 20:06:37 2011 +0100 Updated links.pot from links.html --- src/vidalia/help/content/po/templates/links.pot | 108 ++++++++++------------- 1 files changed, 47 insertions(+), 61 deletions(-) diff --git a/src/vidalia/help/content/po/templates/links.pot b/src/vidalia/help/content/po/templates/links.pot index c9580ad..953242a 100644 --- a/src/vidalia/help/content/po/templates/links.pot +++ b/src/vidalia/help/content/po/templates/links.pot @@ -5,8 +5,8 @@ ## the LICENSE file, found in the top level directory of this ## distribution. If you did not receive the LICENSE file with this ## file, you may obtain it from the Vidalia source package distributed -## by the Vidalia Project at http://www.vidalia-project.net/. No part -## of Vidalia, including this file, may be copied, modified, +## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html. +## No part of Vidalia, including this file, may be copied, modified, ## propagated, or distributed except according to the terms described ## in the LICENSE file. ## @@ -14,97 +14,83 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-06-26 16:59+0200\n" +"POT-Creation-Date: 2011-05-05 20:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" -#. type: Content of: <html><body><h1> -#: en/links.html:16 +#. type: h1 +#: FIXME:0 +#, no-wrap msgid "Helpful Links" msgstr "" -#. type: Content of: <html><body><h3> -#: en/links.html:19 +#. type: h3 +#: FIXME:0 +#, no-wrap msgid "Vidalia" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73 +#. type: td +#: FIXME:0 FIXME:0 FIXME:0 FIXME:0 FIXME:0 +#, no-wrap msgid "   " msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:23 en/links.html:51 +#. type: td +#: FIXME:0 FIXME:0 +#, no-wrap msgid "Homepage" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:25 -msgid "" -"<a href=\"https://www.torproject.org/vidalia/\"> " -"https://www.torproject.org/vidalia/</a>" -msgstr "" - -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:31 en/links.html:66 -msgid "Wiki" -msgstr "" - -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:33 -msgid "" -"<a href=\"http://trac.vidalia-project.net/wiki\"> " -"http://trac.vidalia-project.net/wiki</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "https://www.torproject.org/vidalia/" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:39 en/links.html:74 -msgid "Bugtracker" +#. type: td +#: FIXME:0 FIXME:0 +#, no-wrap +msgid "Wiki and Bugtracker" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:41 -msgid "" -"<a href=\"http://trac.vidalia-project.net/report\"> " -"http://trac.vidalia-project.net/report</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "http://trac.torproject.org/" msgstr "" -#. type: Content of: <html><body><h3> -#: en/links.html:47 +#. type: h3 +#: FIXME:0 +#, no-wrap msgid "Tor" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:53 -msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "https://www.torproject.org/" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:58 +#. type: td +#: FIXME:0 +#, no-wrap msgid "FAQ" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:60 -msgid "" -"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> " -"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>" -msgstr "" - -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:68 -msgid "" -"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> " -"https://wiki.torproject.org/noreply/TheOnionRouter</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "https://www.torproject.org/docs/faq.html" msgstr "" -#. type: Content of: <html><body><table><tr><td> -#: en/links.html:76 -msgid "" -"<a href=\"https://bugs.torproject.org/flyspray/\"> " -"https://bugs.torproject.org/flyspray</a>" +#. type: a +#: FIXME:0 +#, no-wrap +msgid "https://trac.torproject.org/" msgstr ""

1 0

[tor/maint-0.2.2] fix the website directions.
by nickm＠torproject.org 05 May '11

05 May '11

commit be7e8f5bb90acbf6717b9a14d21fdf4733c5d9e5 Author: Andrew Lewman <andrew(a)torproject.org> Date: Thu May 5 15:18:14 2011 -0400 fix the website directions. --- doc/HACKING | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index e00aeb1..feafb55 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -475,12 +475,10 @@ and push the git tag. (That's either "git tag -u <keyid> tor-0.2.x.y-status", then "git push origin tag tor-0.2.x.y-status". To sign the tarball, "gpg -ba <the_tarball>". Put the files in - /src/www-master.torproject.org/htdocs/dist on vescum, then - sudo -u mirroradm -H /home/mirroradm/bin/trigger-mirrors sudoed - ) + /srv/www-master.torproject.org/htdocs/dist/ on vescum.) -8) Edit include/versions.wmi to note the new version. Rebuild and push -the website. +8) Edit include/versions.wmi to note the new version. From your website +checkout, run ./publish to build and publish 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.

1 0