- tor-commits - lists.torproject.org

[atlas/master] s/Tor Status/Atlas/
by art＠torproject.org 15 Mar '12

15 Mar '12

commit 27bbc2e2baf4f2b96d90992f3766883eb0d43acf Author: Arturo Filastò <hellais(a)gmail.com> Date: Wed Mar 14 13:07:48 2012 -0700 s/Tor Status/Atlas/ --- index.html | 2 +- templates/about.html | 6 +++--- templates/search/main.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 41e2a4a..5d5b044 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>Tor Status Beta</title> + <title>Atlas</title> <meta name="description" content=""> <meta name="author" content=""> diff --git a/templates/about.html b/templates/about.html index 3ae0969..876b49b 100644 --- a/templates/about.html +++ b/templates/about.html @@ -1,7 +1,7 @@ <header id="about"> -<h1>Tor Status</h1> +<h1>Atlas</h1> <p class="lead"> -Tor Status is a web application to discover Tor relays and bridges. It provides useful information on how relays are configured along with graphics about their past. +Atlas is a web application to discover Tor relays and bridges. It provides useful information on how relays are configured along with graphics about their past. </p> </header> @@ -50,7 +50,7 @@ The protocol used for retrieving relay data in Onionoo you can check it out <div class="span4"> <h2>Libraries</h2> <p> -Tor Status uses <a href="http://documentcloud.github.com/backbone/">Backbone.js</a> as an MV* framework, with <a href="http://requirejs.org/">require.js</a> for AMD loading of +Atlas uses <a href="http://documentcloud.github.com/backbone/">Backbone.js</a> as an MV* framework, with <a href="http://requirejs.org/">require.js</a> for AMD loading of dependencies. <a href="http://jquery.com/">jQuery</a> and <a href="http://documentcloud.github.com/underscore/">Underscore.js</a> as JS utility libraries. <a href="http://datatables.net/">Datatables</a> for visualizing data in tabular form with custom filtering. <a href="http://code.google.com/p/flot/">Flot</a> for making pretty charts. <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> as a CSS framework. diff --git a/templates/search/main.html b/templates/search/main.html index 8db0a4f..e89a7ed 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -1,7 +1,7 @@ <div class="container"> <div class="splash"> - <h1>Tor Status Beta is out!</h1> - <p>Tor Status is a web application to learn about currently running Tor relays and bridges. Enter your search in the above box to get started.</p> + <h1>Welcome to Atlas.</h1> + <p>Atlas is a web application to learn about currently running Tor relays and bridges. Enter your search in the above box to get started.</p> <p class="learn-more"><a class="btn btn-info btn-large" href="#about">Learn more »</a></p> </div> </div>

1 0

[tor/master] Stop discarding command-line arguments when TestingTorNetwork is set
by arma＠torproject.org 14 Mar '12

14 Mar '12

commit 12594f27db7fce73db6b1e5f6f758b46265e36c7 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 14 02:40:04 2012 -0400 Stop discarding command-line arguments when TestingTorNetwork is set Discovered by Kevin Bauer. Fixes bug 5373; bugfix on 0.2.3.9-alpha, where task 4552 added support for two layers of torrc files. --- changes/bug5373 | 5 +++++ src/or/config.c | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/changes/bug5373 b/changes/bug5373 new file mode 100644 index 0000000..0e1ebe8 --- /dev/null +++ b/changes/bug5373 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Stop discarding command-line arguments when TestingTorNetwork + is set. Discovered by Kevin Bauer. Fixes bug 5373; bugfix on + 0.2.3.9-alpha, where task 4552 added support for two layers of + torrc files. diff --git a/src/or/config.c b/src/or/config.c index 3a7bf65..0c699b0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4660,6 +4660,13 @@ options_init_from_string(const char *cf_defaults, const char *cf, if (i==0) newdefaultoptions = options_dup(&options_format, newoptions); } + /* Assign command-line variables a second time too */ + retval = config_assign(&options_format, newoptions, + global_cmdline_options, 0, 0, msg); + if (retval < 0) { + err = SETOPT_ERR_PARSE; + goto err; + } } /* Validate newoptions */

1 0

[tor/master] retroactively say which ticket the defaults torrc patch was
by arma＠torproject.org 14 Mar '12

14 Mar '12

commit 279f03e76f3f7c7ecf029334afe2de9b6f9b20a9 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 14 02:31:18 2012 -0400 retroactively say which ticket the defaults torrc patch was --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11f5180..821370f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -558,7 +558,7 @@ Changes in version 0.2.3.9-alpha - 2011-12-08 differ between the current configuration and the defaults file. HUP reloads both files. (Note: This is an experimental feature; its behavior will probably be refined in future 0.2.3.x-alpha versions - to better meet packagers' needs.) + to better meet packagers' needs.) Implements task 4552. o Minor features: - Try to make the introductory warning message that Tor prints on

1 0

[torbrowser/maint-2.2] bump firefox to 11.0
by erinn＠torproject.org 14 Mar '12

14 Mar '12

commit eaf6322fba04e03163494b8d2d0ae012a2c2903b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 13 23:44:55 2012 -0300 bump firefox to 11.0 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index eae9019..6af2e51 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ VIDALIA_VER=0.2.17 LIBEVENT_VER=2.0.17-stable TOR_VER=0.2.2.35 PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.2 +FIREFOX_VER=11.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 14 Mar '12

14 Mar '12

commit ba98f8cfbeb957cea28d5ab16b0c4a0ea5940a2f Merge: 5cc51cb eaf6322 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 13 23:45:29 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] bump firefox to 11.0
by erinn＠torproject.org 14 Mar '12

14 Mar '12

commit 9db4078add9227e4ca4120a27de2ad6a22feae79 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 13 23:45:36 2012 -0300 bump firefox to 11.0 --- build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index cd8f511..a9397cf 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.3.12-alpha HTTPSEVERY_VER=2.0development.4 -FIREFOX_VER=10.0.2 +FIREFOX_VER=11.0 LIBEVENT_VER=2.0.17-stable LIBPNG_VER=1.5.7 NOSCRIPT_VER=2.3

1 0

[torbrowser/maint-2.3] bump firefox to 11.0
by erinn＠torproject.org 14 Mar '12

14 Mar '12

commit eaf6322fba04e03163494b8d2d0ae012a2c2903b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 13 23:44:55 2012 -0300 bump firefox to 11.0 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index eae9019..6af2e51 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ VIDALIA_VER=0.2.17 LIBEVENT_VER=2.0.17-stable TOR_VER=0.2.2.35 PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.2 +FIREFOX_VER=11.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1

1 0

[torbrowser/master] bump firefox to 11.0
by erinn＠torproject.org 14 Mar '12

14 Mar '12

commit eaf6322fba04e03163494b8d2d0ae012a2c2903b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 13 23:44:55 2012 -0300 bump firefox to 11.0 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index eae9019..6af2e51 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ VIDALIA_VER=0.2.17 LIBEVENT_VER=2.0.17-stable TOR_VER=0.2.2.35 PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.2 +FIREFOX_VER=11.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 14 Mar '12

14 Mar '12

commit ba98f8cfbeb957cea28d5ab16b0c4a0ea5940a2f Merge: 5cc51cb eaf6322 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 13 23:45:29 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] bump firefox to 11.0
by erinn＠torproject.org 14 Mar '12

14 Mar '12

commit 9db4078add9227e4ca4120a27de2ad6a22feae79 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 13 23:45:36 2012 -0300 bump firefox to 11.0 --- build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index cd8f511..a9397cf 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.3.12-alpha HTTPSEVERY_VER=2.0development.4 -FIREFOX_VER=10.0.2 +FIREFOX_VER=11.0 LIBEVENT_VER=2.0.17-stable LIBPNG_VER=1.5.7 NOSCRIPT_VER=2.3

1 0