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

[obfsproxy/master] Ship with LICENSE and Doxyfile, explicitly mention ChangeLog and README
by asn＠torproject.org 06 Mar '12

06 Mar '12

commit f1a2e5adb6d21ea6588e8809f272aa1eae91a871 Author: Peter Palfrader <peter(a)palfrader.org> Date: Mon Mar 5 22:15:01 2012 +0100 Ship with LICENSE and Doxyfile, explicitly mention ChangeLog and README --- Makefile.am | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index 189ee08..002df7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,10 @@ noinst_HEADERS = \ src/test/tinytest_macros.h EXTRA_DIST = \ + ChangeLog \… [View More]

1 0

[obfsproxy/master] Update changelog for #5311.
by asn＠torproject.org 06 Mar '12

06 Mar '12

commit 31b8fb394144bea143cc6baa1f945617c17f5636 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 5 16:58:32 2012 -0800 Update changelog for #5311. --- ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa68790..0b8663e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Changes in version 0.1.1 - <not yet released> + - Add trailing slash to the torproject URL in the man page. Fixes + bug #… [View More]

1 0

[obfsproxy/master] Minor nitpick edit of the manpage: the proper URL ends with a slash.
by asn＠torproject.org 06 Mar '12

06 Mar '12

commit 8d8e03b8f818bf4337ed963a8a87443589017246 Author: Peter Palfrader <peter(a)palfrader.org> Date: Mon Mar 5 21:54:40 2012 +0100 Minor nitpick edit of the manpage: the proper URL ends with a slash. --- doc/obfsproxy.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/obfsproxy.1 b/doc/obfsproxy.1 index 3cc7224..15ab03a 100644 --- a/doc/obfsproxy.1 +++ b/doc/obfsproxy.1 @@ -28,7 +28,7 @@ Disable logging .SH SEE ALSO .B tor(1) -.B https://www.… [View More]

1 0

[atlas/master] Show family of the current relay, and only link fingerprints
by art＠torproject.org 05 Mar '12

05 Mar '12

commit e8b2299728918499a96048b87f6f4600a065f85c Author: Michael Zeltner <m(a)niij.org> Date: Tue Feb 21 23:47:01 2012 +0100 Show family of the current relay, and only link fingerprints --- js/models/relay.js | 1 + templates/details/main.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index c0f5a10..b195f01 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -132,6 +132,7 @@ define([ … [View More]

1 0

[atlas/master] Adding family list to detail view, linking to other relays
by art＠torproject.org 05 Mar '12

05 Mar '12

commit b99774eb4c9f687c06de901e886b9da53bfb06a5 Author: Michael Zeltner <m(a)niij.org> Date: Mon Feb 20 01:55:04 2012 +0100 Adding family list to detail view, linking to other relays --- templates/details/main.html | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/templates/details/main.html b/templates/details/main.html index f03decd..14bdaa7 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -62,6 +62,10 @@ <dt><… [View More]

1 0

[atlas/master] Merge pull request #10 from mzeltner/master
by art＠torproject.org 05 Mar '12

05 Mar '12

commit 8ef4f59f6f0725662ce81f3ecb9dbd97c938db8d Merge: d7e68fb e8b2299 Author: Arturo Filastò <hellais(a)gmail.com> Date: Wed Feb 22 22:17:53 2012 -0800 Merge pull request #10 from mzeltner/master Include family in relay view js/models/relay.js | 1 + templates/details/main.html | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-)

1 0

[atlas/master] Fix country display in search results
by art＠torproject.org 05 Mar '12

05 Mar '12

commit e4ba1baac62cfa6109bae5f47b11aa9b3f4b0177 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Mar 2 16:18:09 2012 -0800 Fix country display in search results --- js/models/relay.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index c0f5a10..f43593c 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -133,7 +133,7 @@ define([ var bw = relay.advertised_bandwidth; … [View More]

1 0

[atlas/master] Merge branch 'master' of github.com:hellais/TorStatus
by art＠torproject.org 05 Mar '12

05 Mar '12

commit 35279d825cdf4ac8c655f243baa9c3a3759ecc76 Merge: e4ba1ba 8ef4f59 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Mar 2 16:19:06 2012 -0800 Merge branch 'master' of github.com:hellais/TorStatus js/models/relay.js | 1 + templates/details/main.html | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --cc js/models/relay.js index f43593c,b195f01..a72d838 --- a/js/models/relay.js +++ b/js/models/relay.js @@@ -132,8 -132,9 +132,9 @@@ define( … [View More]

1 0

[atlas/master] Proper error handling and fix code repository in about page
by art＠torproject.org 05 Mar '12

05 Mar '12

commit 353adc4b92fceb4f9d361be12e37de0150ad7c95 Author: Arturo Filastò <hellais(a)gmail.com> Date: Mon Mar 5 15:11:44 2012 -0800 Proper error handling and fix code repository in about page * Add error handling for NoScript (fix #5316) * Point to gitweb.tpo instead of github --- js/collections/results.js | 19 ++++++++++++++++++- templates/about.html | 2 +- templates/search/do.html | 4 ++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/… [View More]js/collections/results.js b/js/collections/results.js index 127ea1e..4b06e95 100644 --- a/js/collections/results.js +++ b/js/collections/results.js @@ -49,7 +49,24 @@ define([ } }); }); - }).error(function() {console.log("error in doing query..");error(2)}); + }).error( + function(jqXHR, textStatus, errorThrown) { + console.log(jqXHR); + if(jqXHR.statusText == "error") { + error(2); + } else { + error(3); + } + /* + console.log("jqXHR: " + + jqXHR + " textStauts: " + + textStatus + " errorThrown: " + + errorThrown); + console.log("error in doing query.."); + error(2) + */ + } + ); } }); diff --git a/templates/about.html b/templates/about.html index 55003e2..3ae0969 100644 --- a/templates/about.html +++ b/templates/about.html @@ -61,7 +61,7 @@ dependencies. <a href="http://jquery.com/">jQuery</a> and <a href="http://docume <h2>Open Source</h2> <p> All the code for this website is Open Source. It actually couldn't be otherwise since it is all being loaded into the browser ;). But it's also released under BSD 2 clause license. -The sources can be found on <a href="https://github.com/hellais/TorStatus">github</a> +The sources can be found on <a href="https://gitweb.torproject.org/atlas.git">https://gitweb.torproject.org/atlas.git</a> </p> </div> </div> diff --git a/templates/search/do.html b/templates/search/do.html index 8ff2fca..c84ed19 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -17,6 +17,10 @@ <strong>Backend error!</strong><p>The backend server replied with an error to your query. This probably means that you did not properly format your query. Or that you just are trying to fuzz my web app hoping to pwn me. Good luck! ;)</p> </div> + <% } else if (error == 3) {%> + <div class="alert alert-error"> + <strong>JavaScript Error!</strong><p>There is a problem with your javascript environment, you may have noscript enabled on the remote onionoo backend. Try temporarily allowing noscript to connect to the backend IP address. If the problem persits consult <a href="https://trac.torproject.org/">the bugtracker.</a></p> + </div> <% } %> <% } else { %> <table cellpadding="0" cellspacing="0" border="0" class="table table-bordered table-striped" id="torstatus_results"> [View Less]

1 0

[vidalia/alpha] Change the wording from New Identity to New Circuit
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit c04b3d44c5065c07e59fc8dc8543c5fa43b98d47 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 10:09:16 2012 -0300 Change the wording from New Identity to New Circuit --- src/vidalia/MainWindow.cpp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 7c67e0b..732ca26 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -167,7 +167,7 @@ MainWindow::… [View More]createActions() _actionShowControlPanel = new QAction(QIcon(IMG_CONTROL_PANEL), tr("Control Panel"), this); _actionRestartTor = new QAction(tr("Restart"), this); _actionReloadConfig = new QAction(tr("Reload Tor's config"), this); - _actionNewIdentity = new QAction(QIcon(IMG_IDENTITY), tr("New Identity"), this); + _actionNewIdentity = new QAction(QIcon(IMG_IDENTITY), tr("New Circuit"), this); _actionStatus = new QAction(QIcon(IMG_CONTROL_PANEL), tr("Status"), this); _actionNetworkMap = new QAction(QIcon(IMG_NETWORK), tr("Network Map"), this); _actionMessageLog= new QAction(QIcon(IMG_MESSAGELOG), tr("Message Log"), this); @@ -362,7 +362,7 @@ MainWindow::retranslateUi() _actionNetworkMap->setText(tr("Network Map")); _actionStatus->setText(tr("Status")); _actionVidaliaHelp->setText(tr("Help")); - _actionNewIdentity->setText(tr("New Identity")); + _actionNewIdentity->setText(tr("New Circuit")); #if !defined(Q_WS_MAC) _actionAbout->setText(tr("About")); @@ -951,7 +951,7 @@ MainWindow::authenticated() tr("Connecting to the Tor network")); } - /* Let people click on their beloved "New Identity" button */ + /* Let people click on their beloved "New Circuit" button */ _actionNewIdentity->setEnabled(true); /* Register for any pertinent asynchronous events. */ @@ -1616,7 +1616,7 @@ MainWindow::showConfigDialog(ConfigDialog::Page page) configDialog->showWindow(page); } -/** Called when the user selects the "New Identity" action from the menu. */ +/** Called when the user selects the "New Circuit" action from the menu. */ void MainWindow::newIdentity() { @@ -1627,7 +1627,7 @@ MainWindow::newIdentity() * just use a message box. */ if (_torControl->signal(TorSignal::NewNym, &errmsg)) { /* NEWNYM signal was successful */ - QString title = tr("New Identity"); + QString title = tr("New Circuit"); QString message = tr("All subsequent connections will " "appear to be different than your " "old connections."); [View Less]

1 0