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

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

03 Apr '12

commit edd91f582be790812320ab441097a44dad572585 Merge: 38a0675 24ed18b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Apr 3 19:00:07 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/RelativeLink/RelativeLinkOSX.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

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

03 Apr '12

commit edd91f582be790812320ab441097a44dad572585 Merge: 38a0675 24ed18b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Apr 3 19:00:07 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/RelativeLink/RelativeLinkOSX.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

r25598: {website} the preferred way to edit torrc for debian apt users is not (website/trunk/docs/en)
by Roger Dingledine 03 Apr '12

03 Apr '12

Author: arma Date: 2012-04-03 21:36:29 +0000 (Tue, 03 Apr 2012) New Revision: 25598 Modified: website/trunk/docs/en/faq.wml Log: the preferred way to edit torrc for debian apt users is not via vidalia Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2012-04-03 21:31:02 UTC (rev 25597) +++ website/trunk/docs/en/faq.wml 2012-04-03 21:36:29 UTC (rev 25598) @@ -1016,12 +1016,13 @@ users should need to modify their torrc file directly. -The preferred way to edit your torrc is through Vidalia. Open the +Tor Browser Bundle users should edit your torrc through Vidalia. Open the Vidalia Control Panel. Choose Settings. Choose Advanced. Click the button labelled "Edit current torrc". Remember to make sure the checkbox for "Save Settings." is checked. Hit the Ok button and you are done. +Otherwise, you will need to edit the file manually. The location of your torrc file depends on the way you installed Tor: <ul>

1 0

r25597: {website} ha. we've been giving out a broken tshirt link to all our hi (website/trunk)
by Roger Dingledine 03 Apr '12

03 Apr '12

Author: arma Date: 2012-04-03 21:31:02 +0000 (Tue, 03 Apr 2012) New Revision: 25597 Modified: website/trunk/.htaccess Log: ha. we've been giving out a broken tshirt link to all our high-value donators. Modified: website/trunk/.htaccess =================================================================== --- website/trunk/.htaccess 2012-04-03 16:23:28 UTC (rev 25596) +++ website/trunk/.htaccess 2012-04-03 21:31:02 UTC (rev 25597) @@ -34,6 +34,7 @@ RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L] RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L] RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L] +RewriteRule ^tshirt(.*) /getinvolved/tshirt$1 [R=301,L] # other (feel free to categorize) RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]

1 0

[atlas/master] Avoid setting badexit model attribute to false when true
by art＠torproject.org 03 Apr '12

03 Apr '12

commit 0adeedc475716f82febb6fa6945d53384748c120 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Apr 3 14:16:51 2012 -0700 Avoid setting badexit model attribute to false when true --- js/models/relay.js | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index 21eb6c2..0147fbe 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -19,8 +19,6 @@ define([ if (flag == "BadExit") { model.set({badexit: true}); output.push([flag, "denied_"+size[0]]); - } else { - model.set({badexit: false}); } if (flag == "Fast") { output.push([flag,"bolt_"+size[0]]); @@ -143,6 +141,7 @@ define([ relay.countryname = CountryCodes[relay.country]; relay.uptime = model.parsedate(relay.last_restarted); relay.uptime_hr = relay.uptime.hr; + relay.badexit = false; //console.log(relay.uptime.hrfull); relay.uptime_hrfull = relay.uptime.hrfull; relay.uptime = relay.uptime.millisecs;

1 0

[atlas/master] Properly display the BadExit flag fixes #5559
by art＠torproject.org 03 Apr '12

03 Apr '12

commit 51fab9bf2999a51776a6866b4d5bdc3c41992c91 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Apr 3 14:11:32 2012 -0700 Properly display the BadExit flag fixes #5559 --- img/flags/denied_16x16.png | Bin 0 -> 244 bytes js/models/relay.js | 9 +++++++-- js/views/details/main.js | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/img/flags/denied_16x16.png b/img/flags/denied_16x16.png new file mode 100644 index 0000000..4acbf6b Binary files /dev/null and b/img/flags/denied_16x16.png differ diff --git a/js/models/relay.js b/js/models/relay.js index 7d2d68e..21eb6c2 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -12,10 +12,16 @@ define([ parseflags: function(flags, size) { var output = []; var model = this; - _.each(flags, function(flag, model) { + _.each(flags, function(flag) { if (flag == "Authority") { output.push([flag,"award_stroke_"+size[2]]); } + if (flag == "BadExit") { + model.set({badexit: true}); + output.push([flag, "denied_"+size[0]]); + } else { + model.set({badexit: false}); + } if (flag == "Fast") { output.push([flag,"bolt_"+size[0]]); } @@ -46,7 +52,6 @@ define([ if (flag == "Exit") { output.push([flag,"cloud_download_"+size[0]]); } - }); return output; }, diff --git a/js/views/details/main.js b/js/views/details/main.js index 36b81d4..8c6b9b4 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -57,6 +57,8 @@ define([ grid: { hoverable: true, clickable: true }, xaxis: {mode: 'time', tickLength: 5}, }); + $("#"+g).resize(); + $("#save_"+g).attr('href', Canvas2Image.saveAsPNG($("#"+g+" > canvas.base")[0], false));

1 0

[atlas/master] Fix bug with flags not displaying properly
by art＠torproject.org 03 Apr '12

03 Apr '12

commit 82ae070eb2962e2d72b8a149684251b077df2b68 Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Mar 22 15:26:09 2012 -0700 Fix bug with flags not displaying properly --- js/models/relay.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index 8a617af..7d2d68e 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -134,7 +134,8 @@ define([ relay.bandwidth = bw; relay.family = relay.family ? relay.family : null; relay.bandwidth_hr = hrBandwidth(bw); - relay.countryname = CountryCodes[relay.country.toLowerCase()]; + relay.country = relay.country.toLowerCase(); + relay.countryname = CountryCodes[relay.country]; relay.uptime = model.parsedate(relay.last_restarted); relay.uptime_hr = relay.uptime.hr; //console.log(relay.uptime.hrfull);

1 0

r25596: {website} add latest news stories. (website/trunk/press/en)
by Andrew Lewman 03 Apr '12

03 Apr '12

Author: phobos Date: 2012-04-03 16:23:28 +0000 (Tue, 03 Apr 2012) New Revision: 25596 Modified: website/trunk/press/en/inthemedia.wml Log: add latest news stories. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2012-04-03 03:13:27 UTC (rev 25595) +++ website/trunk/press/en/inthemedia.wml 2012-04-03 16:23:28 UTC (rev 25596) @@ -32,8 +32,14 @@ <th>Topic</th> </tr> </thead> +<tr> +<td>2012 Apr 03</td> +<td>V3</td> +<td><a href="http://www.v3.co.uk/v3-uk/news/2165733/swedish-researchers-uncover-key-chin…">Swedish researchers uncover key to China's Tor-blocking system</a></td> +</tr> <tr style="background-color: #e5e5e5;"> <td>2012 Apr 02</td> +<td>The Guardian</td> <td><a href="http://www.guardian.co.uk/media/2012/apr/02/internet-companies-warn-governm…">Internet companies warn over government email surveillance plans</a></td> </td> <tr>

1 0

[tor/master] Merge remote-tracking branch 'asn-mytor/bug5558_take2'
by nickm＠torproject.org 03 Apr '12

03 Apr '12

commit b8e582255e8ee920904c71ed9d4ff3927f22757a Merge: 6a9e693 b80728a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 3 12:06:07 2012 -0400 Merge remote-tracking branch 'asn-mytor/bug5558_take2' changes/bug5558 | 3 +++ src/common/util.c | 2 +- src/test/test_util.c | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/master] tor_vsscanf(): Don't return -1 if '%%' doesn't match.
by nickm＠torproject.org 03 Apr '12

03 Apr '12

commit b80728a115213abfaab6b3a124caac617ce5d253 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 3 16:20:24 2012 +0200 tor_vsscanf(): Don't return -1 if '%%' doesn't match. tor_vsscanf() is supposed to return the current number of matches on match failure. --- changes/bug5558 | 3 +++ src/common/util.c | 2 +- src/test/test_util.c | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug5558 b/changes/bug5558 new file mode 100644 index 0000000..90ab3a6 --- /dev/null +++ b/changes/bug5558 @@ -0,0 +1,3 @@ + o Minor bugfixes + - Enforce correct return behavior of tor_vsscanf(), when the '%%' + pattern is used. Fixes bug 5558. diff --git a/src/common/util.c b/src/common/util.c index 266368c..551ee17 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2773,7 +2773,7 @@ tor_vsscanf(const char *buf, const char *pattern, va_list ap) ++n_matched; } else if (*pattern == '%') { if (*buf != '%') - return -1; + return n_matched; ++buf; ++pattern; } else { diff --git a/src/test/test_util.c b/src/test/test_util.c index 88f00e0..f2123c5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1384,7 +1384,6 @@ test_util_sscanf(void) test_eq(-1, tor_sscanf("wrong", "%5c", s1)); /* %c cannot have a number. */ test_eq(-1, tor_sscanf("hello", "%s", s1)); /* %s needs a number. */ test_eq(-1, tor_sscanf("prettylongstring", "%999999s", s1)); - test_eq(-1, tor_sscanf("We're the 99 monkeys", "We're the 99%%")); #if 0 /* GCC thinks these two are illegal. */ test_eq(-1, tor_sscanf("prettylongstring", "%0s", s1)); @@ -1468,6 +1467,11 @@ test_util_sscanf(void) /* Literal '%' (ie. '%%') */ test_eq(1, tor_sscanf("99% fresh", "%3u%% fresh", &u1)); test_eq(99, u1); + test_eq(0, tor_sscanf("99 fresh", "%% %3u %s", &u1, s1)); + test_eq(1, tor_sscanf("99 fresh", "%3u%% %s", &u1, s1)); + test_eq(2, tor_sscanf("99 fresh", "%3u %5s %%", &u1, s1)); + test_eq(99, u1); + test_streq(s1, "fresh"); test_eq(1, tor_sscanf("% boo", "%% %3s", s1)); test_streq("boo", s1);

1 0