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

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 29 Apr '12

29 Apr '12

commit 82cf86894c096bac13d5108d06868464b65748e4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 29 11:15:27 2012 +0000 Update translations for whisperback --- sk/sk.po | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 246 insertions(+), 0 deletions(-) diff --git a/sk/sk.po b/sk/sk.po new file mode 100644 index 0000000..b59a1b8 --- /dev/null +++ b/sk/sk.po @@ -0,0 +1,246 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-02-16 22:33+0100\n" +"PO-Revision-Date: 2012-02-26 16:11+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:63 +#, python-format +msgid "Invalid contact email: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:80 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:82 +msgid "Invalid contact OpenPGP public key block" +msgstr "" + +#: ../whisperBack/encryption.py:126 +msgid "No keys found." +msgstr "" + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The variable %s was not found in any of the configuation " +"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "" + +#: ../whisperBack/gui.py:114 +msgid "Name of the affected software" +msgstr "" + +#: ../whisperBack/gui.py:115 +msgid "Exact steps to reproduce the problem" +msgstr "" + +#: ../whisperBack/gui.py:116 +msgid "Actual result / the problem" +msgstr "" + +#: ../whisperBack/gui.py:117 +msgid "Desired result" +msgstr "" + +#: ../whisperBack/gui.py:155 +msgid "Unable to load a valid configuration." +msgstr "" + +#: ../whisperBack/gui.py:177 +#, python-format +msgid "" +"<h1>Help us fix your bug!</h1>\n" +"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n" +"<p><strong>Do not include more personal information than\n" +"needed!</strong></p>\n" +"<h2>About giving us an email address</h2>\n" +"<p>If you don't mind disclosing some bits of your identity\n" +"to Tails developers, you can provide an email address to\n" +"let us ask more details about the bug. Additionally entering\n" +"a public PGP key enables us to encrypt such future\n" +"communication.</p>\n" +"<p>Anyone who can see this reply will probably infer you are\n" +"a Tails user. Time to wonder how much you trust your\n" +"Internet and mailbox providers?</p>\n" +msgstr "" + +#: ../whisperBack/gui.py:229 +msgid "Sending mail..." +msgstr "" + +#: ../whisperBack/gui.py:230 +msgid "Sending mail" +msgstr "" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:232 +msgid "This could take a while..." +msgstr "" + +#: ../whisperBack/gui.py:246 +msgid "The contact email adress doesn't seem valid." +msgstr "" + +#: ../whisperBack/gui.py:263 +msgid "Unable to send the mail: SMTP error." +msgstr "" + +#: ../whisperBack/gui.py:265 +msgid "Unable to connect to the server." +msgstr "" + +#: ../whisperBack/gui.py:267 +msgid "Unable to create or to send the mail." +msgstr "" + +#: ../whisperBack/gui.py:270 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "" + +#: ../whisperBack/gui.py:283 +msgid "Your message has been sent." +msgstr "" + +#: ../whisperBack/gui.py:289 +msgid "Unable to find encryption key." +msgstr "" + +#: ../whisperBack/gui.py:293 +msgid "An error occured during encryption." +msgstr "" + +#: ../whisperBack/gui.py:313 +#, python-format +msgid "Unable to save %s." +msgstr "" + +#. XXX: fix string +#: ../whisperBack/gui.py:337 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "" + +#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 +msgid "WhisperBack" +msgstr "" + +#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 +msgid "Send feedback in an encrypted mail." +msgstr "" + +#: ../whisperBack/gui.py:405 +msgid "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" +msgstr "" + +#: ../whisperBack/gui.py:406 +msgid "Tails developers <tails(a)boum.org>" +msgstr "" + +#: ../whisperBack/gui.py:407 +msgid "translator-credits" +msgstr "" + +#: ../whisperBack/gui.py:434 +msgid "This doesn's seem to be a valid URL or OpenPGP key." +msgstr "" + +#: ../data/whisperback.ui.h:1 +msgid "" +"Add a PGP key if you want us to encrypt messages when we respond to you." +msgstr "" + +#: ../data/whisperback.ui.h:2 +msgid "Bug description" +msgstr "" + +#: ../data/whisperback.ui.h:3 +msgid "Copyright © 2009-2011 tails(a)boum.org" +msgstr "" + +#: ../data/whisperback.ui.h:4 +msgid "Help" +msgstr "" + +#: ../data/whisperback.ui.h:5 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "" + +#: ../data/whisperback.ui.h:6 +msgid "Optional email address to contact you" +msgstr "" + +#: ../data/whisperback.ui.h:7 +msgid "Send" +msgstr "" + +#: ../data/whisperback.ui.h:9 +msgid "Summary" +msgstr "" + +#: ../data/whisperback.ui.h:10 +msgid "Technical details to include" +msgstr "" + +#: ../data/whisperback.ui.h:12 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2011 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "" + +#: ../data/whisperback.ui.h:29 +msgid "headers" +msgstr "" + +#: ../data/whisperback.ui.h:30 +msgid "https://tails.boum.org/" +msgstr "" + +#: ../data/whisperback.ui.h:31 +msgid "optional PGP key" +msgstr ""

1 0

[arm/release] fix: getProcessName should return the base name
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 3f71b5115476a27d6fc58260a6a72125a6a92297 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 18 14:38:10 2011 -0800 fix: getProcessName should return the base name When the proc query failed the fallback ps command would return the command's full path rather than just the base name. This in turn would make lookups that use this value (like netstat) fail. Caught by Stephan Seitz. --- src/util/sysTools.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/sysTools.py b/src/util/sysTools.py index 4bb0667..1c84462 100644 --- a/src/util/sysTools.py +++ b/src/util/sysTools.py @@ -152,6 +152,7 @@ def getProcessName(pid, default = None, cacheFailure = True): return default else: + processName = os.path.basename(processName) PROCESS_NAME_CACHE[pid] = processName return processName

1 0

[arm/release] Skipping import of readline when showing cli
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit b86e5bf8d186124e3e7cc7d76e737b33bf174ab0 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 23 08:11:54 2011 -0800 Skipping import of readline when showing cli Commit 3e1a135, which added a startup option for running the control interpretor without the rest of arm, also caused us to inadvertantly import the readline module prior to starting curses. This import ordering royally screws the terminal in some use cases, most noticeably if you... - start arm within a screen session - detatch and resize the terminal - reattach to the screen session I've seen several other terminal glitches that I'm suspecting is related to this too, but until now didn't have a repro case. I'm fixing this by removing the readline import entirely unless we're specifically showing the prompt. Thanks to Stephan Seitz for catching this and suggesting a repo! --- src/util/torInterpretor.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 1ff3b84..4fa0dff 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -6,7 +6,6 @@ directly, history and tab completion. import re import sys -import readline import version @@ -961,6 +960,13 @@ class ControlInterpretor: return (inputLines, outputLines) def showPrompt(): + # When displaying the prompt we want the readline module to be imported so + # we get its neat features like history scrollback. HOWEVER, importing + # readline prior to initializing curses causes terminal bugs, most noticeably + # screen resizing. + + import readline + # For Python 2.6 and earlier cycling history via the readline module with # up/down is buggy with a color prompt. For more information see: # http://bugs.python.org/issue12972

1 0

[arm/release] Prevent crash on startup when reading Feb 29th in logs
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit a570d9f726473b47d48be4f912a8fa0c7bfd639f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 29 03:01:21 2012 +0100 Prevent crash on startup when reading Feb 29th in logs During prepopulation of log entries, arm tries to parse the date that Tor gives it. Unfortunately Python is a little (read: very) silly and refuses to accept that February 29th can be a valid day when information about the year is missing. As a solution, we just pretend it is the year 2012 forever when parsing dates from logs (Tor doesn't add the year to its date information). Fixes bug 5265, first reported by an anonymous user from IRC. --- src/cli/logPanel.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 179db9f..496fe86 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -302,8 +302,12 @@ def getLogFileEntries(runlevels, readLimit = None, addLimit = None, config = Non # overwrites missing time parameters with the local time (ignoring wday # and yday since they aren't used) - eventTimeComp = list(time.strptime(timestamp, "%b %d %H:%M:%S")) - eventTimeComp[0] = currentLocalTime.tm_year + # Pretend the year is 2012, because 2012 is a leap year, and parsing a + # date with strptime fails if Feb 29th is passed without a year that's + # actually a leap year. We can't just use the current year, because we + # might be parsing old logs which didn't get rotated. + timestamp = "2012 " + timestamp + eventTimeComp = list(time.strptime(timestamp, "%Y %b %d %H:%M:%S")) eventTimeComp[8] = currentLocalTime.tm_isdst eventTime = time.mktime(eventTimeComp) # converts local to unix time

1 0

[arm/release] Accounting for big-endian architectures in proc
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 8ec7095d79ecad9d3432193a2b1f9fdefab8d7f3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 7 10:38:34 2012 -0800 Accounting for big-endian architectures in proc The proc utils were assuming that encoded ip addresses were little-endian. This was fixed in the project these utils are based on (psutil) and I'm adopting the fix... https://code.google.com/p/psutil/issues/detail?id=201 https://trac.torproject.org/projects/tor/ticket/4777 This evidently occures on OpenWRT (ar71xx), thanks to swalker for the catch! --- src/util/procTools.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/util/procTools.py b/src/util/procTools.py index a592989..39b5407 100644 --- a/src/util/procTools.py +++ b/src/util/procTools.py @@ -288,7 +288,15 @@ def _decodeProcAddressEncoding(addr): # The IPv4 address portion is a little-endian four-byte hexadecimal number. # That is, the least significant byte is listed first, so we need to reverse # the order of the bytes to convert it to an IP address. - ip = socket.inet_ntop(socket.AF_INET, base64.b16decode(ip)[::-1]) + # + # This needs to account for the endian ordering as per... + # http://code.google.com/p/psutil/issues/detail?id=201 + # https://trac.torproject.org/projects/tor/ticket/4777 + + if sys.byteorder == 'little': + ip = socket.inet_ntop(socket.AF_INET, base64.b16decode(ip)[::-1]) + else: + ip = socket.inet_ntop(socket.AF_INET, base64.b16decode(ip)) return (ip, port)

1 0

[arm/release] Logging rather than raising on unrecognized auth method
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit d1b56733f521a33eb44d0ba86001d8fd40e242af Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 5 08:14:09 2012 -0700 Logging rather than raising on unrecognized auth method Part of the code that I copied from TorCtl raises an IOError when we get an unrecognized auth method (my bad, I wrote it). Changing that in our copy to log a warning instead. Caught by "E" (email subject: SAFECOOKIE) --- src/util/torTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index a4ab70c..d132e28 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -430,7 +430,7 @@ class FixedConnection(TorCtl.Connection): # not of a recognized authentication type (new addition to the # control-spec?) - raise IOError("Unrecognized authentication type: %s" % authEntry) + log.log(log.WARN, "Unrecognized authentication type: %s" % authEntry) elif entry.startswith("COOKIEFILE=\"") and entry.endswith("\""): # Quoted path of the authentication cookie. This only exists if we're # using cookie auth and, of course, doesn't account for chroot.

1 0

[arm/release] Minor tweak to commenting around the leap year bug
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit f2080aad4e069074c8c7320970b51892def719fc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 29 07:35:00 2012 -0800 Minor tweak to commenting around the leap year bug Tweak for the preceeding comment and including the ticket with the comment. --- src/cli/logPanel.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 496fe86..dd22558 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -300,12 +300,15 @@ def getLogFileEntries(runlevels, readLimit = None, addLimit = None, config = Non # strips the decimal seconds if "." in timestamp: timestamp = timestamp[:timestamp.find(".")] - # overwrites missing time parameters with the local time (ignoring wday - # and yday since they aren't used) + # Ignoring wday and yday since they aren't used. + # # Pretend the year is 2012, because 2012 is a leap year, and parsing a # date with strptime fails if Feb 29th is passed without a year that's # actually a leap year. We can't just use the current year, because we # might be parsing old logs which didn't get rotated. + # + # https://trac.torproject.org/projects/tor/ticket/5265 + timestamp = "2012 " + timestamp eventTimeComp = list(time.strptime(timestamp, "%Y %b %d %H:%M:%S")) eventTimeComp[8] = currentLocalTime.tm_isdst

1 0

[arm/release] Adding arm icon svg and .desktop file
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 3caa8e665827b260b06646009ee8ab9555dfd4ca Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 19 18:50:30 2012 -0700 Adding arm icon svg and .desktop file Adding the same sort of icon svg that I used on the website. This is based on 'utilities-system-monitor.svg' from the Oxygen icon set, which is used by KDE and under GPLv2 and CC v3 (A, SA). Also adding a '.desktop' metadata file for the arm gui provided by Juan. --- src/resources/tor-arm.desktop | 12 + src/resources/tor-arm.svg | 1074 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1086 insertions(+), 0 deletions(-) diff --git a/src/resources/tor-arm.desktop b/src/resources/tor-arm.desktop new file mode 100644 index 0000000..bf922a5 --- /dev/null +++ b/src/resources/tor-arm.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Tor monitor +Name[es]=Monitor de Tor +Comment=Status monitor for Tor routers +Comment[es]=Monitor de estado para routers Tor +GenericName=Monitor +GenericName[es]=Monitor +Exec=arm -g +Icon=tor-arm +Terminal=false +Type=Application +Categories=System;Monitor;GTK diff --git a/src/resources/tor-arm.svg b/src/resources/tor-arm.svg new file mode 100644 index 0000000..8e710ab --- /dev/null +++ b/src/resources/tor-arm.svg @@ -0,0 +1,1074 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="128" + height="128" + id="svg2" + inkscape:version="0.48.1 r9760" + sodipodi:docname="utilities-system-monitor.svg"> + <metadata + id="metadata261"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1024" + inkscape:window-height="550" + id="namedview259" + showgrid="false" + inkscape:zoom="2.3828125" + inkscape:cx="64" + inkscape:cy="63.692344" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient4199"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop4201" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="stop4203" /> + </linearGradient> + <linearGradient + id="linearGradient4167"> + <stop + style="stop-color:#171717;stop-opacity:1" + offset="0" + id="stop4169" /> + <stop + style="stop-color:#777;stop-opacity:1" + offset="1" + id="stop4171" /> + </linearGradient> + <linearGradient + id="linearGradient4159"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop4161" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="stop4163" /> + </linearGradient> + <linearGradient + id="linearGradient4142"> + <stop + style="stop-color:#e5ff00;stop-opacity:1" + offset="0" + id="stop4144" /> + <stop + style="stop-color:#e5ff00;stop-opacity:0" + offset="1" + id="stop4146" /> + </linearGradient> + <linearGradient + id="linearGradient3399"> + <stop + style="stop-color:yellow;stop-opacity:1" + offset="0" + id="stop3401" /> + <stop + style="stop-color:yellow;stop-opacity:0" + offset="1" + id="stop3403" /> + </linearGradient> + <linearGradient + id="linearGradient3391"> + <stop + style="stop-color:#ffff1d;stop-opacity:1" + offset="0" + id="stop3393" /> + <stop + style="stop-color:#ffff6f;stop-opacity:0" + offset="1" + id="stop3395" /> + </linearGradient> + <linearGradient + id="linearGradient3383"> + <stop + style="stop-color:yellow;stop-opacity:1" + offset="0" + id="stop3385" /> + <stop + style="stop-color:yellow;stop-opacity:0" + offset="1" + id="stop3387" /> + </linearGradient> + <linearGradient + id="linearGradient4111"> + <stop + style="stop-color:black;stop-opacity:1" + offset="0" + id="stop4113" /> + <stop + style="stop-color:black;stop-opacity:0" + offset="1" + id="stop4115" /> + </linearGradient> + <linearGradient + id="linearGradient4031"> + <stop + style="stop-color:#292929;stop-opacity:1" + offset="0" + id="stop4033" /> + <stop + style="stop-color:#e9e9e9;stop-opacity:1" + offset="1" + id="stop4035" /> + </linearGradient> + <linearGradient + id="linearGradient4002"> + <stop + style="stop-color:lime;stop-opacity:1" + offset="0" + id="stop4004" /> + <stop + style="stop-color:#f0ff80;stop-opacity:0" + offset="1" + id="stop4006" /> + </linearGradient> + <linearGradient + id="linearGradient3785"> + <stop + style="stop-color:black;stop-opacity:1" + offset="0" + id="stop3787" /> + <stop + style="stop-color:black;stop-opacity:0" + offset="1" + id="stop3789" /> + </linearGradient> + <linearGradient + id="linearGradient3761"> + <stop + style="stop-color:#f6f6f6;stop-opacity:1" + offset="0" + id="stop3763" /> + <stop + style="stop-color:#5a5a5a;stop-opacity:1" + offset="1" + id="stop3765" /> + </linearGradient> + <linearGradient + id="linearGradient3749"> + <stop + style="stop-color:#181818;stop-opacity:1" + offset="0" + id="stop3751" /> + <stop + style="stop-color:#ababab;stop-opacity:1" + offset="1" + id="stop3753" /> + </linearGradient> + <linearGradient + id="linearGradient3737"> + <stop + style="stop-color:gray;stop-opacity:1" + offset="0" + id="stop3739" /> + <stop + style="stop-color:#232323;stop-opacity:1" + offset="1" + id="stop3741" /> + </linearGradient> + <linearGradient + id="linearGradient3729"> + <stop + style="stop-color:#ededed;stop-opacity:1" + offset="0" + id="stop3731" /> + <stop + style="stop-color:#bcbcbc;stop-opacity:1" + offset="1" + id="stop3733" /> + </linearGradient> + <linearGradient + id="linearGradient3570"> + <stop + style="stop-color:black;stop-opacity:1" + offset="0" + id="stop3572" /> + <stop + style="stop-color:black;stop-opacity:0" + offset="1" + id="stop3574" /> + </linearGradient> + <linearGradient + id="linearGradient3470"> + <stop + style="stop-color:#ddd;stop-opacity:1" + offset="0" + id="stop3472" /> + <stop + style="stop-color:#fbfbfb;stop-opacity:1" + offset="1" + id="stop3474" /> + </linearGradient> + <linearGradient + id="linearGradient3452"> + <stop + style="stop-color:#979797;stop-opacity:1" + offset="0" + id="stop3454" /> + <stop + style="stop-color:#454545;stop-opacity:1" + offset="1" + id="stop3456" /> + </linearGradient> + <linearGradient + id="linearGradient3440"> + <stop + style="stop-color:black;stop-opacity:1" + offset="0" + id="stop3442" /> + <stop + style="stop-color:black;stop-opacity:0" + offset="1" + id="stop3444" /> + </linearGradient> + <linearGradient + id="linearGradient3384"> + <stop + style="stop-color:black;stop-opacity:1" + offset="0" + id="stop3386" /> + <stop + style="stop-color:black;stop-opacity:0" + offset="1" + id="stop3388" /> + </linearGradient> + <linearGradient + id="linearGradient3292"> + <stop + style="stop-color:#5e5e5e;stop-opacity:1" + offset="0" + id="stop3294" /> + <stop + style="stop-color:#292929;stop-opacity:1" + offset="1" + id="stop3296" /> + </linearGradient> + <linearGradient + id="linearGradient3275"> + <stop + style="stop-color:#323232;stop-opacity:1" + offset="0" + id="stop3277" /> + <stop + style="stop-color:#1a1a1a;stop-opacity:1" + offset="1" + id="stop3279" /> + </linearGradient> + <linearGradient + id="linearGradient3265"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop3267" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="stop3269" /> + </linearGradient> + <filter + id="filter3162"> + <feGaussianBlur + id="feGaussianBlur3164" + stdDeviation="0.14753906" + inkscape:collect="always" /> + </filter> + <filter + id="filter3193"> + <feGaussianBlur + id="feGaussianBlur3195" + stdDeviation="0.12753906" + inkscape:collect="always" /> + </filter> + <filter + id="filter3247" + height="1.60944" + y="-0.30472" + width="1.03826" + x="-0.019130022"> + <feGaussianBlur + id="feGaussianBlur3249" + stdDeviation="0.89273437" + inkscape:collect="always" /> + </filter> + <radialGradient + cx="64" + cy="7.1979251" + r="56" + fx="64" + fy="7.1979251" + id="radialGradient3271" + xlink:href="#linearGradient3265" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.236503,0,0,0.798045,-15.13621,10.25573)" /> + <radialGradient + cx="56" + cy="65.961678" + r="44" + fx="56" + fy="64.752823" + id="radialGradient3281" + xlink:href="#linearGradient3292" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.206761,0,0,2.057714,-67.57862,-106.9325)" /> + <radialGradient + cx="56" + cy="60" + r="44" + fx="56" + fy="99.821198" + id="radialGradient3287" + xlink:href="#linearGradient3275" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.497439,3.473066e-8,-3.238492e-8,1.3963,-27.85656,-45.05228)" /> + <radialGradient + cx="56" + cy="60" + r="44" + fx="56" + fy="99.821198" + id="radialGradient3289" + xlink:href="#linearGradient3275" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.497439,3.473066e-8,-3.238492e-8,1.3963,-27.85656,-44.05228)" /> + <clipPath + id="clipPath3361"> + <rect + width="88" + height="72" + rx="5.0167508" + ry="5.0167508" + x="12" + y="24" + style="opacity:1;fill:url(#radialGradient3365);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3363" /> + </clipPath> + <radialGradient + cx="56" + cy="65.961678" + r="44" + fx="56" + fy="64.752823" + id="radialGradient3365" + xlink:href="#linearGradient3292" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.206761,0,0,2.057714,-67.57862,-106.9325)" /> + <linearGradient + x1="52.513512" + y1="97" + x2="52.513512" + y2="74.244766" + id="linearGradient3390" + xlink:href="#linearGradient3384" + gradientUnits="userSpaceOnUse" /> + <clipPath + id="clipPath3402"> + <rect + width="88" + height="72" + rx="5.0167508" + ry="5.0167508" + x="12" + y="24" + style="opacity:1;fill:url(#radialGradient3406);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3404" /> + </clipPath> + <radialGradient + cx="56" + cy="65.961678" + r="44" + fx="56" + fy="64.752823" + id="radialGradient3406" + xlink:href="#linearGradient3292" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.206761,0,0,2.057714,-67.57862,-106.9325)" /> + <filter + id="filter3424"> + <feGaussianBlur + id="feGaussianBlur3426" + stdDeviation="0.23507812" + inkscape:collect="always" /> + </filter> + <filter + id="filter3430"> + <feGaussianBlur + id="feGaussianBlur3432" + stdDeviation="0.23507812" + inkscape:collect="always" /> + </filter> + <linearGradient + x1="100" + y1="92.763115" + x2="100" + y2="60" + id="linearGradient3446" + xlink:href="#linearGradient3440" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="100" + y1="92.763115" + x2="100" + y2="60" + id="linearGradient3450" + xlink:href="#linearGradient3440" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,-120)" /> + <radialGradient + cx="108.33566" + cy="25.487402" + r="4.171701" + fx="108.33566" + fy="25.487402" + id="radialGradient3458" + xlink:href="#linearGradient3452" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.432375,0,0,1.432375,-46.84166,-11.02012)" /> + <linearGradient + x1="110.75722" + y1="32.559616" + x2="106.72433" + y2="24.216215" + id="linearGradient3476" + xlink:href="#linearGradient3470" + gradientUnits="userSpaceOnUse" /> + <filter + id="filter3549" + height="1.348368" + y="-0.17418399" + width="1.1806649" + x="-0.090332433"> + <feGaussianBlur + id="feGaussianBlur3551" + stdDeviation="0.099971814" + inkscape:collect="always" /> + </filter> + <filter + id="filter3553" + height="1.2047423" + y="-0.10237114" + width="1.2103517" + x="-0.10517583"> + <feGaussianBlur + id="feGaussianBlur3555" + stdDeviation="0.099971814" + inkscape:collect="always" /> + </filter> + <filter + id="filter3557" + height="1.348368" + y="-0.17418399" + width="1.1806649" + x="-0.090332433"> + <feGaussianBlur + id="feGaussianBlur3559" + stdDeviation="0.099971814" + inkscape:collect="always" /> + </filter> + <filter + id="filter3561" + height="1.2047423" + y="-0.10237114" + width="1.2103517" + x="-0.10517583"> + <feGaussianBlur + id="feGaussianBlur3563" + stdDeviation="0.099971814" + inkscape:collect="always" /> + </filter> + <linearGradient + x1="111.58585" + y1="31.213261" + x2="116.79939" + y2="35.079716" + id="linearGradient3576" + xlink:href="#linearGradient3570" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-0.559618,-0.203498)" /> + <filter + id="filter3590"> + <feGaussianBlur + id="feGaussianBlur3592" + stdDeviation="0.29695312" + inkscape:collect="always" /> + </filter> + <linearGradient + x1="111.58585" + y1="31.213261" + x2="116.79939" + y2="35.079716" + id="linearGradient3671" + xlink:href="#linearGradient3570" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-0.559618,-0.203498)" /> + <radialGradient + cx="108.33566" + cy="25.487402" + r="4.171701" + fx="108.33566" + fy="25.487402" + id="radialGradient3673" + xlink:href="#linearGradient3452" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.432375,0,0,1.432375,-46.84166,-11.02012)" /> + <linearGradient + x1="110.75722" + y1="32.559616" + x2="106.72433" + y2="24.216215" + id="linearGradient3675" + xlink:href="#linearGradient3470" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="111.58585" + y1="31.213261" + x2="116.79939" + y2="35.079716" + id="linearGradient3711" + xlink:href="#linearGradient3570" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-0.559618,-0.203498)" /> + <radialGradient + cx="108.33566" + cy="25.487402" + r="4.171701" + fx="108.33566" + fy="25.487402" + id="radialGradient3713" + xlink:href="#linearGradient3452" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.432375,0,0,1.432375,-46.84166,-11.02012)" /> + <linearGradient + x1="110.75722" + y1="32.559616" + x2="106.72433" + y2="24.216215" + id="linearGradient3715" + xlink:href="#linearGradient3470" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="110" + y1="84" + x2="110" + y2="72.081078" + id="linearGradient3735" + xlink:href="#linearGradient3729" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="110" + y1="84" + x2="110" + y2="88" + id="linearGradient3743" + xlink:href="#linearGradient3737" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="110" + y1="84" + x2="110" + y2="72.081078" + id="linearGradient3747" + xlink:href="#linearGradient3729" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.2,0,-90.8)" /> + <radialGradient + cx="110" + cy="87.735802" + r="4" + fx="110" + fy="87.735802" + id="radialGradient3755" + xlink:href="#linearGradient3749" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(5.343975,0,0,6.161922,-477.8373,-454.2492)" /> + <linearGradient + x1="113.34818" + y1="79.669319" + x2="118.02862" + y2="79.669319" + id="linearGradient3791" + xlink:href="#linearGradient3785" + gradientUnits="userSpaceOnUse" /> + <filter + id="filter3853" + height="1.1794737" + y="-0.089736843" + width="1.6153383" + x="-0.30766916"> + <feGaussianBlur + id="feGaussianBlur3855" + stdDeviation="0.54783699" + inkscape:collect="always" /> + </filter> + <linearGradient + x1="98.899841" + y1="40.170177" + x2="98.899841" + y2="104.503" + id="linearGradient4008" + xlink:href="#linearGradient4002" + gradientUnits="userSpaceOnUse" /> + <clipPath + id="clipPath4019"> + <rect + width="88" + height="72" + rx="5.0167508" + ry="5.0167508" + x="12" + y="24" + style="opacity:0.65263157;fill:url(#linearGradient4023);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4021" /> + </clipPath> + <linearGradient + x1="100" + y1="92.763115" + x2="100" + y2="60" + id="linearGradient4023" + xlink:href="#linearGradient3440" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="100" + y1="92.763115" + x2="100" + y2="72.820351" + id="linearGradient4027" + xlink:href="#linearGradient3440" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="100" + y1="65.697929" + x2="95.716316" + y2="65.697929" + id="linearGradient4099" + xlink:href="#linearGradient3440" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="100" + y1="65.697929" + x2="95.909744" + y2="65.697929" + id="linearGradient4103" + xlink:href="#linearGradient3440" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-112,0)" /> + <linearGradient + x1="48.9221" + y1="24" + x2="48.9221" + y2="30.250481" + id="linearGradient4107" + xlink:href="#linearGradient3440" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-112,0)" /> + <radialGradient + cx="64" + cy="73.977821" + r="52" + fx="64" + fy="73.977821" + id="radialGradient4119" + xlink:href="#linearGradient4111" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.285229,0,74.89936)" + spreadMethod="reflect" /> + <filter + id="filter4137" + height="1.5494737" + y="-0.27473684" + width="1.0634008" + x="-0.031700405"> + <feGaussianBlur + id="feGaussianBlur4139" + stdDeviation="1.3736842" + inkscape:collect="always" /> + </filter> + <clipPath + id="clipPath3379"> + <rect + width="88" + height="72" + rx="5.0167508" + ry="5.0167508" + x="-100" + y="23" + transform="scale(-1,1)" + style="opacity:0.32105264;fill:black;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3381" /> + </clipPath> + <linearGradient + x1="100.11033" + y1="69.474098" + x2="-17.198158" + y2="69.474098" + id="linearGradient3389" + xlink:href="#linearGradient3383" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="101.41602" + y1="64.334373" + x2="-35.975773" + y2="64.334373" + id="linearGradient3397" + xlink:href="#linearGradient3391" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="99.727539" + y1="63.027271" + x2="-3.3565123" + y2="63.027271" + id="linearGradient3405" + xlink:href="#linearGradient3399" + gradientUnits="userSpaceOnUse" /> + <filter + id="filter3411" + height="1.3350769" + y="-0.16753846" + width="1.0821887" + x="-0.04109434"> + <feGaussianBlur + id="feGaussianBlur3413" + stdDeviation="1.815" + inkscape:collect="always" /> + </filter> + <filter + id="filter4138" + height="1.252" + y="-0.126" + width="1.252" + x="-0.126"> + <feGaussianBlur + id="feGaussianBlur4140" + stdDeviation="0.21" + inkscape:collect="always" /> + </filter> + <radialGradient + cx="18" + cy="102" + r="2" + fx="18" + fy="102" + id="radialGradient4148" + xlink:href="#linearGradient4142" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.25543,0,0,3.25543,-40.59774,-230.0538)" /> + <linearGradient + x1="20.930662" + y1="96.872108" + x2="23.156008" + y2="105.17721" + id="linearGradient4165" + xlink:href="#linearGradient4159" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="34.736519" + y1="106.93066" + x2="21.263483" + y2="100" + id="linearGradient4173" + xlink:href="#linearGradient4167" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.666667,0,0,1,5.333334,0)" /> + <filter + id="filter4190"> + <feGaussianBlur + id="feGaussianBlur4192" + stdDeviation="2.6020349" + inkscape:collect="always" /> + </filter> + <linearGradient + x1="29.355932" + y1="27.119223" + x2="35.527592" + y2="50.152176" + id="linearGradient4205" + xlink:href="#linearGradient4199" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3440" + id="linearGradient3238" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4101341,0,0,1.4101341,-142.94128,-20.830999)" + x1="100" + y1="65.697929" + x2="95.909744" + y2="65.697929" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3440" + id="linearGradient3240" + gradientUnits="userSpaceOnUse" + x1="100" + y1="65.697929" + x2="95.716316" + y2="65.697929" + gradientTransform="matrix(1.4101341,0,0,1.4101341,-14.993741,-20.830999)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3440" + id="linearGradient3242" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4101341,0,0,1.4101341,-142.94128,-20.830999)" + x1="48.9221" + y1="24" + x2="48.9221" + y2="30.250481" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4199" + id="linearGradient3244" + gradientUnits="userSpaceOnUse" + x1="29.355932" + y1="27.119223" + x2="35.527592" + y2="50.152176" + gradientTransform="matrix(1.4101341,0,0,1.4101341,-14.993741,-20.830999)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3440" + id="linearGradient3246" + gradientUnits="userSpaceOnUse" + x1="100" + y1="92.763115" + x2="100" + y2="72.820351" + gradientTransform="matrix(1.4101341,0,0,1.4101341,-14.993741,-20.830999)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3383" + id="linearGradient3248" + gradientUnits="userSpaceOnUse" + x1="100.11033" + y1="69.474098" + x2="-17.198158" + y2="69.474098" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3391" + id="linearGradient3250" + gradientUnits="userSpaceOnUse" + x1="101.41602" + y1="64.334373" + x2="-35.975773" + y2="64.334373" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3399" + id="linearGradient3252" + gradientUnits="userSpaceOnUse" + x1="99.727539" + y1="63.027271" + x2="-3.3565123" + y2="63.027271" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3440" + id="linearGradient3254" + gradientUnits="userSpaceOnUse" + x1="100" + y1="92.763115" + x2="100" + y2="60" + gradientTransform="matrix(1.4101341,0,0,1.4101341,-14.993741,-20.830999)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3440" + id="linearGradient3256" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4101341,0,0,1.4101341,-14.993741,-148.3851)" + x1="100" + y1="92.763115" + x2="100" + y2="60" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3292" + id="radialGradient3258" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.111829,0,0,2.9016527,-110.28866,-171.62017)" + cx="56" + cy="65.961678" + fx="56" + fy="64.752823" + r="44" /> + </defs> + <g + id="layer1"> + <rect + width="124.0918" + height="101.52966" + rx="7.0742917" + ry="7.0742917" + x="1.9278687" + y="13.01222" + style="fill:url(#radialGradient3258);fill-opacity:1;stroke:none" + id="rect3273" /> + <g + style="opacity:0.25789478;fill:#ff7e00;stroke:#d3d7cf" + clip-path="url(#clipPath3361)" + id="g3349" + transform="matrix(1.4101341,0,0,1.4101341,-14.993741,-20.830999)"> + <path + d="m 24.5,19.5 0,80" + style="fill:#ff7e00;fill-rule:evenodd;stroke:#d3d7cf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path3300" + inkscape:connector-curvature="0" /> + <path + d="m 40.5,19.5 0,80" + style="fill:#ff7e00;fill-rule:evenodd;stroke:#d3d7cf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path3307" + inkscape:connector-curvature="0" /> + <path + d="m 56.5,19.5 0,80" + style="fill:#ff7e00;fill-rule:evenodd;stroke:#d3d7cf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path3309" + inkscape:connector-curvature="0" /> + <path + d="m 72.5,19.5 0,80" + style="fill:#ff7e00;fill-rule:evenodd;stroke:#d3d7cf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path3311" + inkscape:connector-curvature="0" /> + <path + d="m 88.5,19.5 0,80" + style="fill:#ff7e00;fill-rule:evenodd;stroke:#d3d7cf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path3317" + inkscape:connector-curvature="0" /> + <path + d="m 0.5,60.5 110.61729,0" + style="fill:#ff7e00;fill-rule:evenodd;stroke:#d3d7cf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path3325" + inkscape:connector-curvature="0" /> + <path + d="m 0.5,79.5 110.61729,0" + style="fill:#ff7e00;fill-rule:evenodd;stroke:#d3d7cf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path3327" + inkscape:connector-curvature="0" /> + <path + d="m 0.5,40.5 110.61729,0" + style="fill:#ff7e00;fill-rule:evenodd;stroke:#d3d7cf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path3329" + inkscape:connector-curvature="0" /> + </g> + <rect + width="124.0918" + height="101.52966" + rx="7.0742917" + ry="7.0742917" + x="1.9278687" + y="-114.54188" + transform="scale(1,-1)" + style="opacity:0.32105264;fill:url(#linearGradient3256);fill-opacity:1;stroke:none" + id="rect3448" /> + <rect + width="124.0918" + height="101.52966" + rx="7.0742917" + ry="7.0742917" + x="1.9278687" + y="13.01222" + style="opacity:0.43684214;fill:url(#linearGradient3254);fill-opacity:1;stroke:none" + id="rect4025" /> + <g + transform="matrix(1.4101341,0,0,1.4101341,-14.993741,-19.420865)" + clip-path="url(#clipPath3379)" + id="g4010"> + <path + d="M 16.246914,126.84803 -2.6446783,98.771282 12,79.49 l 12,0 12,-24 16,0 12,16 12,0 8,-12 15.306836,0 5.779584,0 -0.0494,65.38272" + style="opacity:0.28494622;fill:url(#linearGradient3248);fill-opacity:1;fill-rule:evenodd;stroke:none" + id="path3431" + inkscape:connector-curvature="0" /> + <path + d="m 4,59.49 8,20 12,0 12,-24 16,0 12,16 12,0 8,-12 15.306836,0 8.693164,0" + style="fill:none;stroke:url(#linearGradient3250);stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path3413" + inkscape:connector-curvature="0" /> + <path + d="m 4,59.49 8,20 12,0 12,-24 16,0 12,16 12,0 8,-12 15.306836,0 8.693164,0" + style="fill:none;stroke:url(#linearGradient3252);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path3857" + inkscape:connector-curvature="0" /> + </g> + <rect + width="124.0918" + height="101.52966" + rx="7.0742917" + ry="7.0742917" + x="1.9278687" + y="13.01222" + style="opacity:0.32105264;fill:url(#linearGradient3246);fill-opacity:1;stroke:none" + id="rect3438" /> + <path + d="m 9.0226062,13.012221 c -3.9191562,0 -7.0947373,3.175579 -7.0947373,7.094737 l 0,30.62635 C 25.678508,39.547637 58.966862,32.577831 95.833988,32.577831 c 10.395432,0 20.489952,0.541015 30.185682,1.586401 l 0,-14.057274 c 0,-3.919156 -3.17558,-7.094737 -7.09474,-7.094737 l -109.9023238,0 z" + style="opacity:0.225;fill:url(#linearGradient3244);fill-opacity:1;stroke:none" + id="rect4194" + inkscape:connector-curvature="0" /> + <rect + width="124.0918" + height="101.52966" + rx="7.0742917" + ry="7.0742917" + x="-126.01967" + y="13.01222" + transform="scale(-1,1)" + style="opacity:0.32105264;fill:url(#linearGradient3242);fill-opacity:1;stroke:none" + id="rect4105" /> + <rect + width="124.0918" + height="101.52966" + rx="7.0742917" + ry="7.0742917" + x="1.9278687" + y="13.01222" + style="opacity:0.32105264;fill:url(#linearGradient3240);fill-opacity:1;stroke:none" + id="rect4097" /> + <rect + width="124.0918" + height="101.52966" + rx="7.0742917" + ry="7.0742917" + x="-126.01967" + y="13.01222" + transform="scale(-1,1)" + style="opacity:0.32105264;fill:url(#linearGradient3238);fill-opacity:1;stroke:none" + id="rect4101" /> + </g> +</svg>

1 0

[arm/release] Better validation for path component of circuit-staus output
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 67b8532f1135b80756339b41e77a06ac33d81aec Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 26 19:10:38 2012 -0700 Better validation for path component of circuit-staus output The 'GETINFO circuit-status' output has an *optional* third arguement that is a path. This is a pita because it's essentially an optional positional arguement that can have '=', so we need to differentiate it from the key=value entities that follow. This resulted in confusing 'Unable to determine fingerprint' warnings, and seemed to cause a screwed up circuit listing. Ticket tracking this is... https://trac.torproject.org/projects/tor/ticket/5267 --- src/util/torTools.py | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index d132e28..7676a97 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -2422,10 +2422,17 @@ class Controller(TorCtl.PostEventListener): for line in circStatusResults.split("\n"): # appends a tuple with the (status, purpose, path) lineComp = line.split(" ") + if len(lineComp) < 3: continue - # skips blank lines and circuits without a path, for instance: - # 5 LAUNCHED PURPOSE=TESTING - if len(lineComp) < 4: continue + # The third parameter is *optionally* the path. This is a pita to + # parse out because we need to identify it verses the key=value + # entries that might follow. To do this checking if... + # - it lacks a '=' then it can't be a key=value entry + # - if it has a '=' but starts with a '$' then this should be a + # $fingerprint=nickname entity + + if lineComp[2].count("=") == 1 and lineComp[2][0] != "$": + continue path = [] for hopEntry in lineComp[2].split(","):

1 0

[arm/release] Lowering unrecognized auth type to INFO
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 1f7e23a01d08e6534ba04b1d81101fc4a70fe49f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 26 19:18:18 2012 -0700 Lowering unrecognized auth type to INFO Now that we have SafeCookie this is gonna be a common warning until we add handling for it. This isn't a notice that should be user facing - it indicates something useful to me, but not users. --- src/util/torTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 7676a97..5b70c6a 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -430,7 +430,7 @@ class FixedConnection(TorCtl.Connection): # not of a recognized authentication type (new addition to the # control-spec?) - log.log(log.WARN, "Unrecognized authentication type: %s" % authEntry) + log.log(log.INFO, "Unrecognized authentication type: %s" % authEntry) elif entry.startswith("COOKIEFILE=\"") and entry.endswith("\""): # Quoted path of the authentication cookie. This only exists if we're # using cookie auth and, of course, doesn't account for chroot.

1 0