November 2016 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Bumping tor-browser branch for nightlies
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 378d6fe95d797ecca6b8aebda169b333da7ec8db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:39:42 2016 +0000 Bumping tor-browser branch for nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f9cfbfb..1a3bc8b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.4.0esr +FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=default

1 0

[tor-launcher/master] Version bump (0.2.11.1)
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 81b73ec3c046ee7eb6bff42019596e34815fddec Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:32:16 2016 +0000 Version bump (0.2.11.1) --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 48599a7..493d976 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.11</em:version> + <em:version>0.2.11.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 6.5a4-hardened
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 0cbe69dbc243ee09a9c536ed43ef705609c68e1e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:06:44 2016 +0000 Release preparations for 6.5a4-hardened Version bumps, Changelog update, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 48 +++++++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 16 ++++++------- tools/update-responses/config.yml | 10 ++++---- 3 files changed, 61 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 68a9d43..fd5b60e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,51 @@ +Tor Browser 6.5a4-hardened -- November 16 2016 + * All Platforms + * Update Firefox to 45.5.0esr + * Update Tor to 0.2.9.5-alpha + * Update OpenSSL to 1.0.2j + * Update Torbutton to 1.9.6.7 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 19459: Move resizing code to tor-browser.git + * Bug 20264: Change security slider to 3 options + * Bug 20347: Enhance security slider's custom mode + * Bug 20123: Disable remote jar on all security levels + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 17546: Add tooltips to explain our privacy checkboxes + * Bug 17904: Allow security settings dialog to resize + * Bug 18093: Remove 'Restore Defaults' button + * Bug 20373: Prevent redundant dialogs opening + * Bug 20388+20399+20394: Code clean-up + * Translation updates + * Update Tor Launcher to 0.2.11.1 + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 20185: Avoid using Unix domain socket paths that are too long + * Bug 20429: Do not open progress window if tor doesn't get started + * Bug 19646: Wrong location for meek browser profile on OS X + * Translation updates + * Update HTTPS-Everywhere to 5.2.7 + * Update meek to 0.25 + * Bug 19646: Wrong location for meek browser profile on OS X + * Bug 20030: Shut down meek-http-helper cleanly if built with Go > 1.5.4 + * Bug 20304: Support spaces and other special characters for SOCKS socket + * Bug 20490: Fix assertion failure due to fix for #20304 + * Bug 19459: Size new windows to 1000x1000 or nearest 200x100 (Firefox patch) + * Bug 20442: Backport fix for local path disclosure after drag and drop + * Bug 20160: Backport fix for broken MP3-playback + * Bug 20043: Isolate SharedWorker script requests to first party + * Bug 20123: Always block remote jar files + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 19838: Add dgoulet's bridge and add another one commented out + * Bug 19481: Point the update URL to aus1.torproject.org + * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20399+15852: Code clean-up + * Bug 15953: Weird resizing dance on Tor Browser startup + * Build system + * All platforms + * Bug 20023: Upgrade Go to 1.7.3 + * Bug 20583: Make the downloads.json file reproducible + Tor Browser 6.5a3-hardened -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 02e2bbd..c22ed9f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,15 +14,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.4.0esr +FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 -TOR_TAG=tor-0.2.9.2-alpha -TORLAUNCHER_TAG=0.2.11 -TORBUTTON_TAG=1.9.6.4 -HTTPSE_TAG=5.2.4 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build3 +TOR_TAG=tor-0.2.9.5-alpha +TORLAUNCHER_TAG=0.2.11.1 +TORBUTTON_TAG=1.9.6.7 +HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -49,7 +49,7 @@ SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4-1 -OPENSSL_VER=1.0.2h +OPENSSL_VER=1.0.2j GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -104,7 +104,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 +OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 022cea2..67d63c9 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,7 +20,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.5a3-hardened + hardened: 6.5a4-hardened release: 6.0.1 versions: 6.0.1: @@ -33,11 +33,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a3-hardened: - platformVersion: 45.4.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a3-hardened-released + 6.5a4-hardened: + platformVersion: 45.5.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a4-hardened-released incremental_from: - - 6.5a2-hardened + - 6.5a3-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor/master] Rewrite the fallback directory mirror list changelog entries
by arma＠torproject.org 14 Nov '16

14 Nov '16

commit 7918e219d45f2cac62b7c3d79fb1d4df4c5d65be Author: teor <teor2345(a)gmail.com> Date: Sun Sep 25 17:10:23 2016 -0700 Rewrite the fallback directory mirror list changelog entries Mention fallback numbers, releases, and dates. This assists in tracking fallback attrition. Closes task 20242. Reported by arma. --- ChangeLog | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5556182..a52c39d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -319,8 +319,9 @@ Changes in version 0.2.9.3-alpha - 2016-09-23 OpenSSL 0.9.7 or later since 2009. Closes ticket 19998. o Minor feature (fallback directories): - - Remove broken entries from the hard-coded fallback directory list. - Closes ticket 20190; patch by teor. + - Remove 8 fallbacks that are no longer suitable, leaving 81 of the + 100 fallbacks originally introduced in Tor 0.2.8.2-alpha in March + 2016. Closes ticket 20190; patch by teor. o Minor features (geoip, also in 0.2.8.8): - Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2 @@ -498,8 +499,9 @@ Changes in version 0.2.8.8 - 2016-09-23 this one. o Minor feature (fallback directories): - - Remove broken fallbacks from the hard-coded fallback directory - list. Closes ticket 20190; patch by teor. + - Remove 8 fallbacks that are no longer suitable, leaving 81 of the + 100 fallbacks originally introduced in Tor 0.2.8.2-alpha in March + 2016. Closes ticket 20190; patch by teor. o Minor features (geoip): - Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2 @@ -953,8 +955,9 @@ Changes in version 0.2.8.6 - 2016-08-02 is signed. Fixes bug 19682; bugfix on 0.2.8.1-alpha. o Minor bugfixes (fallback directories): - - Remove a fallback that was on the hardcoded list, then opted-out. - Fixes bug 19782; update to fallback list from 0.2.8.2-alpha. + - Remove 1 fallback that was on the hardcoded list, then opted-out, + leaving 89 of the 100 fallbacks originally introduced in Tor + 0.2.8.2-alpha in March 2016. Closes ticket 19782; patch by teor. o Minor bugfixes (Linux seccomp2 sandbox): - Allow more syscalls when running with "Sandbox 1" enabled: @@ -1026,8 +1029,9 @@ Changes in version 0.2.8.5-rc - 2016-07-07 - Update fallback whitelist and blacklist based on relay operator emails. Blacklist unsuitable (non-working, over-volatile) fallbacks. Resolves ticket 19071. Patch by teor. - - Update hard-coded fallback list to remove unsuitable fallbacks. - Resolves ticket 19071. Patch by teor. + - Remove 10 unsuitable fallbacks, leaving 90 of the 100 fallbacks + originally introduced in Tor 0.2.8.2-alpha in March 2016. Closes + ticket 19071; patch by teor. Changes in version 0.2.8.4-rc - 2016-06-15 @@ -1137,10 +1141,12 @@ Changes in version 0.2.8.3-alpha - 2016-05-26 - Give each fallback the same weight for client selection; restrict fallbacks to one per operator; report fallback directory detail changes when rebuilding list; add new fallback directory mirrors - to the whitelist; update fallback directories based on the latest - OnionOO data; and any other minor simplifications and fixes. - Closes tasks 17158, 17905, 18749, bug 18689, and fixes part of bug - 18812 on 0.2.8.1-alpha; patch by "teor". + to the whitelist; and many other minor simplifications and fixes. + Closes tasks 17905, 18749, bug 18689, and fixes part of bug 18812 on + 0.2.8.1-alpha; patch by "teor". + - Replace the 21 fallbacks generated in January 2016 and included in + Tor 0.2.8.1-alpha, with a list of 100 fallbacks generated in March + 2016. Closes task 17158; patch by "teor". o Minor features (geoip): - Update geoip and geoip6 to the May 4 2016 Maxmind GeoLite2 @@ -1584,10 +1590,11 @@ Changes in version 0.2.8.1-alpha - 2016-02-04 should reduces failures due to fallback churn. Implements ticket 4483. Patch by "teor". Implements IPv4 portions of proposal 210 by "mikeperry" and "teor". - - Include a trial list of default fallback directories, based on an - opt-in survey of suitable relays. Doing this should make clients - bootstrap more quickly and reliably, and reduce the load on the - directory authorities. Closes ticket 15775. Patch by "teor". + - Include a trial list of 21 default fallback directories, generated + in January 2016, based on an opt-in survey of suitable relays. + Doing this should make clients bootstrap more quickly and reliably, + and reduce the load on the directory authorities. Closes ticket + 15775. Patch by "teor". Candidates identified using an OnionOO script by "weasel", "teor", "gsathya", and "karsten". - Previously only relays that explicitly opened a directory port

1 0

[nyx/master] Better differentiate logs for this tor instance
by atagar＠torproject.org 13 Nov '16

13 Nov '16

commit ad38a8f8cfccd42df63189ebffe2df2196055433 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 13 12:32:55 2016 -0800 Better differentiate logs for this tor instance Tor slightly changed the wording of the first log line it generates, breaking our ability to narrow logs we prepopulate to just this instance. --- nyx/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/log.py b/nyx/log.py index 6e9eb83..aa458a2 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -551,7 +551,7 @@ def read_tor_log(path, read_limit = None): count += 1 yield LogEntry(timestamp, runlevel, msg) - if 'opening log file' in msg: + if 'opening log file' in msg or 'opening new log file' in msg: break # this entry marks the start of this tor instance info('panel.log.read_from_log_file', count = count, path = path, read_limit = read_limit if read_limit else 'none', runtime = '%0.3f' % (time.time() - start_time))

1 0

[nyx/master] Nyxrc header and change path
by atagar＠torproject.org 13 Nov '16

13 Nov '16

commit a6cc11c9301d115a3f75e0d2f63ced840fcd9a91 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 10 10:51:16 2016 -0800 Nyxrc header and change path Adding a header to explain how the nyxrc is used. Also changing the default path where we look for one. ~/.nyxrc would make sense, but since we have a ~/.nyx data directory anyway might as well just call ourselves 'config'. --- nyx/arguments.py | 2 +- nyxrc.sample | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/nyx/arguments.py b/nyx/arguments.py index efb95ee..09c0003 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -22,7 +22,7 @@ DEFAULT_ARGS = { 'user_provided_port': False, 'control_socket': '/var/run/tor/control', 'user_provided_socket': False, - 'config': os.path.join(os.path.expanduser('~/.nyx'), 'nyxrc'), + 'config': os.path.join(os.path.expanduser('~/.nyx'), 'config'), 'debug_path': None, 'logged_events': 'NOTICE,WARN,ERR,NYX_NOTICE,NYX_WARNING,NYX_ERROR', 'print_version': False, diff --git a/nyxrc.sample b/nyxrc.sample index b3c17ed..508c87f 100644 --- a/nyxrc.sample +++ b/nyxrc.sample @@ -1,5 +1,13 @@ +# Nyx can be customized through a configuration file with the following +# options. Values shown below are the default unless marked with a asterisk. +# +# Place your configuration at ~/.nyx/config or run with the following to +# apply the settings... +# +# % nyx --config /path/to/config + data_directory ~/.nyx # Caching location, can be set to 'disabled'. -tor_chroot /path # Chroot jail tor resides within if there is one. +tor_chroot /path # Chroot jail tor resides within if there is one. (*) show_bytes false # Bandwidth rate as bytes if true, bits otherwise. confirm_quit true # Confirm before quitting. color_interface true # Uses color in our interface. @@ -15,8 +23,8 @@ port_usage_rate 5 # Seconds between querying processes using ports. logged_events events # Events that are shown by default in the log. [1] deduplicate_log true # Hides duplicate log messages. prepopulate_log true # Populates with events that occure before we started. -logging_filter pattern # Regex filter for log messages that are shown. -write_logs_to /path # Writes events that occure while running here. +logging_filter pattern # Regex filter for log messages that are shown. (*) +write_logs_to /path # Writes events that occure while running here. (*) max_log_size 1000 # Maximum number of log entries. graph_stat bandwidth # Statistic to be graphed. [2]

1 0

[nyx/master] Drop resources directory
by atagar＠torproject.org 13 Nov '16

13 Nov '16

commit 52772d6d20cd3e0275467a5fec9485a031b0a608 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 11 18:21:50 2016 -0800 Drop resources directory The directory only had three things: starter for our gtk interface, svg for it, and our man page. Of those we only need to keep the last, so moving it to our top level directory and dropping the rest. --- nyx.1 | 64 +++ nyx/resources/nyx.1 | 64 --- nyx/resources/tor-nyx.desktop | 12 - nyx/resources/tor-nyx.svg | 1074 ----------------------------------------- setup.py | 4 +- 5 files changed, 66 insertions(+), 1152 deletions(-) diff --git a/nyx.1 b/nyx.1 new file mode 100644 index 0000000..d32e0ab --- /dev/null +++ b/nyx.1 @@ -0,0 +1,64 @@ +.TH nyx 1 "27 August 2010" +.SH NAME +nyx - Tor terminal status monitor + +.SH SYNOPSIS +nyx [\fIOPTION\fR] + +.SH DESCRIPTION +Nyx is a command line interface for Tor (https://www.torproject.org/) +providing detailed real-time relaying information for... + + * bandwidth, cpu, and memory usage + * connection information + * tor configuration + * event logs + * etc + +As a curses interface Nyx is particularly well suited for ssh connections, tty +terminals, and command-line aficionados to check the status of tor. + +Nyx can be customized through a configuration file located at +\fB~/.nyx/config\fR. For options see our \fBnyxrc.sample\fR. + +.SH OPTIONS +.TP +\fB\-i\fR, \fB\-\-interface [ADDRESS:]PORT\fR +tor control port we should attach to (default is \fB127.0.0.1:9051\fR) + +.TP +\fB\-s\fR, \fB\-\-socket SOCKET_PATH\fR +tor control socket we should attach to (default is \fB/var/run/tor/control\fR) + +.TP +\fB\-c\fR, \fB\-\-config CONFIG_PATH\fR +user configuration preferences (default is \fB~/.nyx/config\fR) + +.TP +\fB\-d\fR, \fB\-\-debug LOG_PATH\fR +writes all nyx logs to the given location + +.TP +\fB\-l\fR, \fB\-\-log EVENTS\fR +comma separated list of events to log + +.TP +\fB\-v\fR, \fB\-\-version\fR +provides version information + +.TP +\fB\-h\fR, \fB\-\-help\fR +provides usage information + +.SH FILES +.TP +\fB~/.nyx/config\fR +Your personal nyx configuration file + +.TP +\fB/usr/share/doc/nyx/nyxrc.sample\fR +Sample nyxrc configuration file that documents all options + +.SH AUTHOR +Written by Damian Johnson (atagar(a)torproject.org) + diff --git a/nyx/resources/nyx.1 b/nyx/resources/nyx.1 deleted file mode 100644 index d32e0ab..0000000 --- a/nyx/resources/nyx.1 +++ /dev/null @@ -1,64 +0,0 @@ -.TH nyx 1 "27 August 2010" -.SH NAME -nyx - Tor terminal status monitor - -.SH SYNOPSIS -nyx [\fIOPTION\fR] - -.SH DESCRIPTION -Nyx is a command line interface for Tor (https://www.torproject.org/) -providing detailed real-time relaying information for... - - * bandwidth, cpu, and memory usage - * connection information - * tor configuration - * event logs - * etc - -As a curses interface Nyx is particularly well suited for ssh connections, tty -terminals, and command-line aficionados to check the status of tor. - -Nyx can be customized through a configuration file located at -\fB~/.nyx/config\fR. For options see our \fBnyxrc.sample\fR. - -.SH OPTIONS -.TP -\fB\-i\fR, \fB\-\-interface [ADDRESS:]PORT\fR -tor control port we should attach to (default is \fB127.0.0.1:9051\fR) - -.TP -\fB\-s\fR, \fB\-\-socket SOCKET_PATH\fR -tor control socket we should attach to (default is \fB/var/run/tor/control\fR) - -.TP -\fB\-c\fR, \fB\-\-config CONFIG_PATH\fR -user configuration preferences (default is \fB~/.nyx/config\fR) - -.TP -\fB\-d\fR, \fB\-\-debug LOG_PATH\fR -writes all nyx logs to the given location - -.TP -\fB\-l\fR, \fB\-\-log EVENTS\fR -comma separated list of events to log - -.TP -\fB\-v\fR, \fB\-\-version\fR -provides version information - -.TP -\fB\-h\fR, \fB\-\-help\fR -provides usage information - -.SH FILES -.TP -\fB~/.nyx/config\fR -Your personal nyx configuration file - -.TP -\fB/usr/share/doc/nyx/nyxrc.sample\fR -Sample nyxrc configuration file that documents all options - -.SH AUTHOR -Written by Damian Johnson (atagar(a)torproject.org) - diff --git a/nyx/resources/tor-nyx.desktop b/nyx/resources/tor-nyx.desktop deleted file mode 100644 index faba9af..0000000 --- a/nyx/resources/tor-nyx.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[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=nyx -g -Icon=tor-nyx -Terminal=false -Type=Application -Categories=System;Monitor;GTK; diff --git a/nyx/resources/tor-nyx.svg b/nyx/resources/tor-nyx.svg deleted file mode 100644 index 8e710ab..0000000 --- a/nyx/resources/tor-nyx.svg +++ /dev/null @@ -1,1074 +0,0 @@ -<?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> diff --git a/setup.py b/setup.py index bfcdefa..81179f7 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ class NyxInstaller(install): install.run(self) self.install_bin_script('run_nyx', os.path.join(self.install_scripts, 'nyx')) - self.install_file('man page', os.path.join('nyx', 'resources', 'nyx.1'), self.man_page) + self.install_file('man page', 'nyx.1', self.man_page) self.install_file('nyxrc sample', 'nyxrc.sample', self.sample_path) def install_bin_script(self, source, dest): @@ -102,6 +102,6 @@ setup( packages = ['nyx', 'nyx.panel'], keywords = 'tor onion controller', install_requires = ['stem>=1.4.1'], - package_data = {'nyx': ['settings/*', 'resources/*']}, + package_data = {'nyx': ['settings/*']}, cmdclass = {'install': NyxInstaller}, )

1 0

[nyx/master] Moving glyph demo into run_tests
by atagar＠torproject.org 13 Nov '16

13 Nov '16

commit 3e5181d7817ac18d78852f5b4e77d1f8ae8ca14a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 11 18:40:13 2016 -0800 Moving glyph demo into run_tests Our demo_glyphs.py didn't work any longer because its 'import curses' clause referenced the local copy rather than the python builtin. Regardless, this is actually a little nicer in curses.py. To run it with the following undocumented option... % run_nyx --demo-glyphs --- nyx/curses.py | 45 +++++++++++++++++++++++++++++++++++++ nyx/demo_glyphs.py | 66 ------------------------------------------------------ run_nyx | 8 ++++++- 3 files changed, 52 insertions(+), 67 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 112fd2e..f25839e 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -19,6 +19,7 @@ if we want Windows support in the future too. screen_size - provides the dimensions of our screen screenshot - dump of the present on-screen content asci_to_curses - converts terminal formatting to curses + demo_glyphs - renders a chart showing the ACS options halt - prevents further curses rendering during shutdown is_color_supported - checks if terminal supports color output @@ -529,6 +530,50 @@ def asci_to_curses(msg): return entries +def demo_glyphs(): + """ + Renders a chart of all ACS options with their corresponding representation. + These are undocumented in the pydocs. For more information see the following + man page... + + http://www.mkssoftware.com/docs/man5/terminfo.5.asp + """ + + def _render(): + with raw_screen() as stdscr: + height, width = stdscr.getmaxyx() + columns = width / 30 + + if columns == 0: + return # not wide enough to show anything + + # mapping of keycodes to their ACS option names (for instance, ACS_LTEE) + + acs_options = dict((v, k) for (k, v) in curses.__dict__.items() if k.startswith('ACS_')) + + stdscr.addstr(0, 0, 'Curses Glyphs:', curses.A_STANDOUT) + x, y = 0, 2 + + for keycode in sorted(acs_options.keys()): + stdscr.addstr(y, x * 30, '%s (%i)' % (acs_options[keycode], keycode)) + stdscr.addch(y, (x * 30) + 25, keycode) + + x += 1 + + if x >= columns: + x, y = 0, y + 1 + + if y >= height: + break + + stdscr.getch() # quit on keyboard input + + try: + start(_render, transparent_background = True, cursor = False) + except KeyboardInterrupt: + pass # quit + + def halt(): """ Prevents further rendering of curses content while python's shutting down. diff --git a/nyx/demo_glyphs.py b/nyx/demo_glyphs.py deleted file mode 100755 index 2978873..0000000 --- a/nyx/demo_glyphs.py +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env python -# Copyright 2014-2016, Damian Johnson and The Tor Project -# See LICENSE for licensing information - -""" -Displays all ACS options with their corresponding representation. These are -undocumented in the pydocs. For more information see the following man page: - -http://www.mkssoftware.com/docs/man5/terminfo.5.asp -""" - -import curses - - -def main(): - try: - curses.wrapper(_show_glyphs) - except KeyboardInterrupt: - pass # quit - - -def _show_glyphs(stdscr): - """ - Renders a chart with the ACS glyphs. - """ - - try: - curses.use_default_colors() # allow semi-transparent backgrounds - except curses.error: - pass - - try: - curses.curs_set(0) # attempt to make the cursor invisible - except curses.error: - pass - - height, width = stdscr.getmaxyx() - columns = width / 30 - - if columns == 0: - return # not wide enough to show anything - - # mapping of keycodes to their ACS option names (for instance, ACS_LTEE) - - acs_options = dict((v, k) for (k, v) in curses.__dict__.items() if k.startswith('ACS_')) - - stdscr.addstr(0, 0, 'Curses Glyphs:', curses.A_STANDOUT) - x, y = 0, 2 - - for keycode in sorted(acs_options.keys()): - stdscr.addstr(y, x * 30, '%s (%i)' % (acs_options[keycode], keycode)) - stdscr.addch(y, (x * 30) + 25, keycode) - - x += 1 - - if x >= columns: - x, y = 0, y + 1 - - if y >= height: - break - - stdscr.getch() # quit on keyboard input - - -if __name__ == '__main__': - main() diff --git a/run_nyx b/run_nyx index 29c6be5..be9f55b 100755 --- a/run_nyx +++ b/run_nyx @@ -2,7 +2,13 @@ # Copyright 2009-2016, Damian Johnson and The Tor Project # See LICENSE for licensing information +import sys + import nyx +import nyx.curses if __name__ == '__main__': - nyx.main() + if '--demo-glyphs' in sys.argv: + nyx.curses.demo_glyphs() + else: + nyx.main()

1 0

[nyx/master] Update man page
by atagar＠torproject.org 13 Nov '16

13 Nov '16

commit b6b11a961668b4873d25d329950a4bdf535ba35d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 11 10:55:51 2016 -0800 Update man page Revising our man page to reflect all the changes we've made. --- nyx/resources/nyx.1 | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/nyx/resources/nyx.1 b/nyx/resources/nyx.1 index a2a8d40..d32e0ab 100644 --- a/nyx/resources/nyx.1 +++ b/nyx/resources/nyx.1 @@ -1,51 +1,46 @@ .TH nyx 1 "27 August 2010" .SH NAME -nyx - Terminal Tor status monitor +nyx - Tor terminal status monitor .SH SYNOPSIS nyx [\fIOPTION\fR] .SH DESCRIPTION -The anonymizing relay monitor (nyx) is a terminal status monitor for Tor -relays, intended for command-line aficionados, ssh connections, and anyone -stuck with a tty terminal. This works much like top does for system usage, -providing real time statistics for: +Nyx is a command line interface for Tor (https://www.torproject.org/) +providing detailed real-time relaying information for... + * bandwidth, cpu, and memory usage - * relay's current configuration - * logged events - * connection details (ip, fingerprint, and consensus data) + * connection information + * tor configuration + * event logs * etc -Defaults and interface properties are configurable via a user provided -configuration file (for an example see the provided \fBnyxrc.sample\fR). -Releases and information are available at \fIhttp://www.atagar.com/nyx\fR. +As a curses interface Nyx is particularly well suited for ssh connections, tty +terminals, and command-line aficionados to check the status of tor. + +Nyx can be customized through a configuration file located at +\fB~/.nyx/config\fR. For options see our \fBnyxrc.sample\fR. .SH OPTIONS .TP \fB\-i\fR, \fB\-\-interface [ADDRESS:]PORT\fR -tor control port nyx should attach to (default is \fB127.0.0.1:9051\fR) +tor control port we should attach to (default is \fB127.0.0.1:9051\fR) + +.TP +\fB\-s\fR, \fB\-\-socket SOCKET_PATH\fR +tor control socket we should attach to (default is \fB/var/run/tor/control\fR) .TP \fB\-c\fR, \fB\-\-config CONFIG_PATH\fR -user provided configuration file (default is \fB~/.nyx/nyxrc\fR) +user configuration preferences (default is \fB~/.nyx/config\fR) .TP -\fB\-d\fR, \fB\-\-debug\fR -writes all nyx logs to ~/.nyx/log +\fB\-d\fR, \fB\-\-debug LOG_PATH\fR +writes all nyx logs to the given location .TP -\fB\-e\fR, \fB\-\-event EVENT_FLAGS\fR -flags for tor, nyx, and torctl events to be logged (default is \fBN3\fR) - - d DEBUG a ADDRMAP k DESCCHANGED s STREAM - i INFO f AUTHDIR_NEWDESCS g GUARD r STREAM_BW - n NOTICE h BUILDTIMEOUT_SET l NEWCONSENSUS t STATUS_CLIENT - w WARN b BW m NEWDESC u STATUS_GENERAL - e ERR c CIRC p NS v STATUS_SERVER - j CLIENTS_SEEN q ORCONN - DINWE tor runlevel+ A All Events - 12345 nyx runlevel+ X No Events - 67890 torctl runlevel+ U Unknown Events +\fB\-l\fR, \fB\-\-log EVENTS\fR +comma separated list of events to log .TP \fB\-v\fR, \fB\-\-version\fR @@ -57,7 +52,7 @@ provides usage information .SH FILES .TP -\fB~/.nyx/nyxrc\fR +\fB~/.nyx/config\fR Your personal nyx configuration file .TP

1 0

[torbirdy/master] Update README.RELEASE
by sukhbir＠torproject.org 13 Nov '16

13 Nov '16

commit 3f4e39cf5a7857fca25795c1b30e0a67a12a69e3 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Nov 13 09:38:36 2016 -0500 Update README.RELEASE --- README.RELEASE | 1 + 1 file changed, 1 insertion(+) diff --git a/README.RELEASE b/README.RELEASE index f398409..8fb2d86 100644 --- a/README.RELEASE +++ b/README.RELEASE @@ -16,5 +16,6 @@ To perform a release for TorBirdy: Upload the package to Mozilla's AddOn site manually Write a blog post anouncing the release on the Tor Project blog Write an email anouncing the release to tor-talk + Bump the version number on the wiki and make other relevant changes Announce the release widely in whatever format is reasonable or desired

1 0