tor-commits July 2014

tor-commits@lists.torproject.org

25 participants
1533 discussions

[torbutton/master] Merge remote-tracking branch 'gk/bug_12680'
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 8830630b30998dfcea4171e6ec1a32ed14c1ad5f Merge: 0fb285c d01eadd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 21:57:40 2014 -0700 Merge remote-tracking branch 'gk/bug_12680' src/chrome/content/about.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[torbutton/master] Bug 12680: Change Torbutton URL in about dialog.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit d01eadd91760507041df3a01a64ba8626c78d483 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 23 09:38:28 2014 +0000 Bug 12680: Change Torbutton URL in about dialog. --- src/chrome/content/about.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/about.xul b/src/chrome/content/about.xul index e5c9525..79c6946 100644 --- a/src/chrome/content/about.xul +++ b/src/chrome/content/about.xul @@ -20,7 +20,7 @@ value="&torbutton.button.label;" onmouseover="event.target.style.cursor='pointer'" onmouseout="event.target.style.cursor='default'" - onclick="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').open('https://www.torproject.org/torbutton/')"/> + onclick="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').open('https://www.torproject.org/docs/torbutton/')"/> <label style="text-align:center; font-size:18px; margin-top: 10px; margin-bottom:20px;">&torbutton.about.summary;</label> <groupbox>

1 0

[torbutton/master] Update version and changelog for 1.6.11.1.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit be0db9403efcde130744e7edb3daa401542dcd44 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 21:58:08 2014 -0700 Update version and changelog for 1.6.11.1. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a1c1428..7f04c4d 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.11.1 + 24 Jul 2014 + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 12680: Fix Torbutton about url. + 1.6.11.0 27 Jun 2014 * Bug 10819: Bind new third party isolation pref to Torbutton security UI diff --git a/src/install.rdf b/src/install.rdf index 5eb071a..6a3aded 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.11.0</em:version> + <em:version>1.6.11.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug 11472: about:tor logo and text may overlap.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 0fb285c3ca6b2196406084a50b11c641f2b8406e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 16 10:33:52 2014 -0400 Bug 11472: about:tor logo and text may overlap. This problem occurred in some non-English locales (e.g., de). We now reduce the font size of some elements if necessary. --- src/chrome/content/aboutTor/aboutTor.xhtml | 9 ++++-- src/chrome/content/torbutton.js | 43 ++++++++++++++++++++++++++++ src/chrome/skin/aboutTor.css | 2 ++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index b99bc7e..f8f829d 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -132,15 +132,20 @@ function insertPropertyStrings() <div id="torstatus" class="top"> <div id="torstatus-version"/> <div id="torstatus-image"/> - <div class="hideIfTorOff"> + <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <h1>&aboutTor.success.label;</h1> + <br/> <h2 id="success2">&aboutTor.success2.label;</h2> + <br/> <h3 class="hideIfTBBNeedsUpdate">&aboutTor.success3.label;</h3> + <br/> <a id="testTorSettings" href="about:blank">&aboutTor.check.label;</a> </div> - <div class="hideIfTorOn"> + <div id="torstatus-off-container" class="hideIfTorOn torstatus-container"> <h1>&aboutTor.failure.label;</h1> + <br/> <h2>&aboutTor.failure2.label;</h2> + <br/> <h3>&aboutTor.failure3prefix.label;<a href="mailto:&aboutTor.failure3Link;" >&aboutTor.failure3Link;</a>&aboutTor.failure3suffix.label;</h3> </div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3e7cf62..f682f05 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -875,12 +875,55 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { e.appendChild(aDoc.createTextNode(productName + '\n' + tbbVersion)); } catch (e) {} + let containerName = "torstatus-" + (aTorOn ? "on" : "off") + "-container"; + torbutton_adjust_abouttor_fontsizes(aDoc, containerName); torbutton_update_abouttor_arrow(aDoc); } return isAboutTor; } +// Ensure that text in top area does not overlap the tor on/off (onion) image. +// This is done by reducing the font sizes as necessary. +function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) +{ + let imgElem = aDoc.getElementById("torstatus-image"); + let containerElem = aDoc.getElementById(aContainerName); + if (!imgElem || !containerElem) + return; + + try + { + let imgRect = imgElem.getBoundingClientRect(); + + for (let textElem = containerElem.firstChild; textElem; + textElem = textElem.nextSibling) + { + if ((textElem.nodeType != textElem.ELEMENT_NODE) || + (textElem.nodeName.toLowerCase() == "br")) + { + continue; + } + + let textRect = textElem.getBoundingClientRect(); + if (0 == textRect.width) + continue; + + // Reduce font to 90% of previous size, repeating the process up to 7 + // times. This allows for a maximum reduction to just less than 50% of + // the original size. + let maxTries = 7; + while ((textRect.left < imgRect.right) && (--maxTries >= 0)) + { + let style = aDoc.defaultView.getComputedStyle(textElem, null); + let fontSize = parseFloat(style.getPropertyValue("font-size")); + textElem.style.fontSize = (fontSize * 0.9) + "px"; + textRect = textElem.getBoundingClientRect(); + } + } + } catch (e) {} +} + // Determine X position of torbutton toolbar item and pass it through // to the xhtml document. function torbutton_update_abouttor_arrow(aDoc) { diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 192e345..0c12374 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -135,6 +135,8 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { margin-left: 30px; } +/* Use inline-block for text-oriented elements whose widths need to measured. */ +.torstatus-container *, .top div.hideIfTorIsUpToDate h3 { display: inline-block; }

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit 261dc0c1421879c810073a132443fa00982fe399 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 00:15:52 2014 +0000 Update translations for tor-and-https --- ko.po | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/ko.po b/ko.po index 1ab77b6..f86ce46 100644 --- a/ko.po +++ b/ko.po @@ -1,12 +1,13 @@ # # Translators: # Dr.what <javrick6(a)naver.com>, 2014 +# Sam Ryoo <samryoo(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-24 16:09+0000\n" -"PO-Revision-Date: 2014-05-25 09:55+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2014-07-25 00:11+0000\n" +"Last-Translator: Sam Ryoo <samryoo(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,107 +31,107 @@ msgstr "Tor와 HTTPS" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Site.com" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "user / pw" -msgstr "" +msgstr "아이디/비밀번호" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "data" msgstr "데이터" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "location" msgstr "영역" #. (itstool) path: defs/text #. Keep it short: 3em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "WiFi" msgstr "" #. (itstool) path: defs/text #. Keep it short: 4em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "ISP" -msgstr "" +msgstr "인터넷 서비스 공급자" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Hacker" msgstr "해커" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Lawyer" -msgstr "" +msgstr "변호사" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Sysadmin" msgstr "시스템 관리자" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Police" msgstr "경찰" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "NSA" msgstr "미 국가 안보국" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Tor relay" msgstr "Tor 중계기" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Key" -msgstr "" +msgstr "열쇠" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Internet connection" msgstr "인터넷 연결" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Eavesdropping" msgstr "도청" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Data sharing" msgstr "데이터 공유"

1 0

[tor/master] fix typo that crept in to 0.2.4.4-alpha
by arma＠torproject.org 24 Jul '14

24 Jul '14

commit a3d8ffe010d860b65b697767b867c3c37f186e36 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 24 17:07:39 2014 -0400 fix typo that crept in to 0.2.4.4-alpha --- src/or/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/channel.c b/src/or/channel.c index 964b3fc..3072eff 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3352,7 +3352,7 @@ channel_dump_statistics(channel_t *chan, int severity) U64_PRINTF_ARG(chan->timestamp_recv), U64_PRINTF_ARG(now - chan->timestamp_recv)); tor_log(severity, LD_GENERAL, - " * Channel " U64_FORMAT " last trasmitted a cell " + " * Channel " U64_FORMAT " last transmitted a cell " "at " U64_FORMAT " (" U64_FORMAT " seconds ago)", U64_PRINTF_ARG(chan->global_identifier), U64_PRINTF_ARG(chan->timestamp_xmit),

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 24 Jul '14

24 Jul '14

commit 1ed77ff724444dec9bd2493d7d28fdd21869bcff Merge: a3d8ffe 1b55182 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 24 19:48:37 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug12227 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/master] Avoid illegal read off end of an array in prune_v2_cipher_list
by arma＠torproject.org 24 Jul '14

24 Jul '14

commit 1b551823de6e6c03cf86bcbb7ca1b687c5f16ea6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 10 11:11:47 2014 -0400 Avoid illegal read off end of an array in prune_v2_cipher_list This function is supposed to construct a list of all the ciphers in the "v2 link protocol cipher list" that are supported by Tor's openssl. It does this by invoking ssl23_get_cipher_by_char on each two-byte ciphersuite ID to see which ones give a match. But when ssl23_get_cipher_by_char cannot find a match for a two-byte SSL3/TLS ciphersuite ID, it checks to see whether it has a match for a three-byte SSL2 ciphersuite ID. This was causing a read off the end of the 'cipherid' array. This was probably harmless in practice, but we shouldn't be having any uninitialized reads. (Using ssl23_get_cipher_by_char in this way is a kludge, but then again the entire existence of the v2 link protocol is kind of a kludge. Once Tor 0.2.2 clients are all gone, we can drop this code entirely.) Found by starlight. Fix on 0.2.4.8-alpha. Fixes bug 12227. --- changes/bug12227 | 5 +++++ src/common/tortls.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug12227 b/changes/bug12227 new file mode 100644 index 0000000..d8b5d08 --- /dev/null +++ b/changes/bug12227 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid an illegal read from stack when initializing the TLS + module using a version of OpenSSL without all of the ciphers + used by the v2 link handshake. Fixes bug 12227; bugfix on + 0.2.4.8-alpha. Found by "starlight". diff --git a/src/common/tortls.c b/src/common/tortls.c index 8f3f6a7..c13b12f 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1489,10 +1489,13 @@ prune_v2_cipher_list(void) inp = outp = v2_cipher_list; while (*inp) { - unsigned char cipherid[2]; + unsigned char cipherid[3]; const SSL_CIPHER *cipher; /* Is there no better way to do this? */ set_uint16(cipherid, htons(*inp)); + cipherid[2] = 0; /* If ssl23_get_cipher_by_char finds no cipher starting + * with a two-byte 'cipherid', it may look for a v2 + * cipher with the appropriate 3 bytes. */ cipher = m->get_cipher_by_char(cipherid); if (cipher) { tor_assert((cipher->id & 0xffff) == *inp);

1 0

[tor/master] Merge branch 'maint-0.2.5'
by arma＠torproject.org 24 Jul '14

24 Jul '14

commit bdc2cefd4e3c6190e74337021889b90be4b6768b Merge: eb3e0e3 472696e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 24 19:49:29 2014 -0400 Merge branch 'maint-0.2.5' src/or/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] get rid of already-merged bug12227 changes file
by arma＠torproject.org 24 Jul '14

24 Jul '14

commit 472696e8e517609d34db4818af7bb4ff6f68a158 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 24 19:49:01 2014 -0400 get rid of already-merged bug12227 changes file --- changes/bug12227 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/changes/bug12227 b/changes/bug12227 deleted file mode 100644 index d8b5d08..0000000 --- a/changes/bug12227 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Avoid an illegal read from stack when initializing the TLS - module using a version of OpenSSL without all of the ciphers - used by the v2 link handshake. Fixes bug 12227; bugfix on - 0.2.4.8-alpha. Found by "starlight".

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2014