tor-commits
Threads by month
- ----- 2026 -----
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 215229 discussions
commit 51b0b7ed2e02b9444eebf75612d53c3a32301f6f
Author: Cecylia Bocovich <cohosh(a)torproject.org>
Date: Thu Mar 19 12:17:56 2020 -0400
Remove proxy/ subdirectory
We're moving all web proxy code to a different repsitory.
---
proxy/.eslintignore | 8 -
proxy/.eslintrc.json | 13 -
proxy/README.md | 143 ----------
proxy/broker.js | 134 ----------
proxy/config.js | 40 ---
proxy/init-badge.js | 223 ----------------
proxy/init-node.js | 27 --
proxy/init-testing.js | 125 ---------
proxy/init-webext.js | 203 --------------
proxy/make.js | 201 --------------
proxy/package.json | 35 ---
proxy/proxypair.js | 249 ------------------
proxy/shims.js | 31 ---
proxy/snowflake.js | 165 ------------
proxy/spec/broker.spec.js | 131 ----------
proxy/spec/init.spec.js | 34 ---
proxy/spec/proxypair.spec.js | 163 ------------
proxy/spec/snowflake.spec.js | 103 --------
proxy/spec/ui.spec.js | 68 -----
proxy/spec/util.spec.js | 252 ------------------
proxy/spec/websocket.spec.js | 41 ---
proxy/static/.htaccess | 5 -
proxy/static/SourceSansPro-Regular.ttf | Bin 293516 -> 0 bytes
proxy/static/_locales/en_US/messages.json | 80 ------
proxy/static/assets/arrowhead-right-12.svg | 4 -
proxy/static/assets/arrowhead-right-dark-12.svg | 4 -
proxy/static/assets/favicon.ico | Bin 1150 -> 0 bytes
proxy/static/assets/status-off-dark.svg | 11 -
proxy/static/assets/status-off.svg | 7 -
proxy/static/assets/status-on-dark.svg | 11 -
proxy/static/assets/status-on.svg | 7 -
proxy/static/assets/status-running.svg | 7 -
proxy/static/assets/toolbar-off-48.png | Bin 3657 -> 0 bytes
proxy/static/assets/toolbar-off-96.png | Bin 7214 -> 0 bytes
proxy/static/assets/toolbar-off.ico | Bin 4286 -> 0 bytes
proxy/static/assets/toolbar-off.svg | 14 -
proxy/static/assets/toolbar-on-48.png | Bin 3674 -> 0 bytes
proxy/static/assets/toolbar-on-96.png | Bin 7355 -> 0 bytes
proxy/static/assets/toolbar-on.ico | Bin 4286 -> 0 bytes
proxy/static/assets/toolbar-on.svg | 14 -
proxy/static/assets/toolbar-running-48.png | Bin 3660 -> 0 bytes
proxy/static/assets/toolbar-running-96.png | Bin 7385 -> 0 bytes
proxy/static/assets/toolbar-running.ico | Bin 4286 -> 0 bytes
proxy/static/assets/toolbar-running.svg | 14 -
proxy/static/bootstrap.css | 334 ------------------------
proxy/static/chrome150.jpg | Bin 5321 -> 0 bytes
proxy/static/embed.css | 150 -----------
proxy/static/embed.html | 30 ---
proxy/static/firefox150.jpg | Bin 44930 -> 0 bytes
proxy/static/index.css | 94 -------
proxy/static/index.html | 116 --------
proxy/static/index.js | 83 ------
proxy/static/popup.js | 50 ----
proxy/static/screenshot.png | Bin 377507 -> 0 bytes
proxy/static/tor-logo(a)2x.png | Bin 10042 -> 0 bytes
proxy/ui.js | 17 --
proxy/util.js | 216 ---------------
proxy/webext/embed.js | 48 ----
proxy/webext/manifest.json | 24 --
proxy/websocket.js | 78 ------
60 files changed, 3807 deletions(-)
diff --git a/proxy/.eslintignore b/proxy/.eslintignore
deleted file mode 100644
index c249199..0000000
--- a/proxy/.eslintignore
+++ /dev/null
@@ -1,8 +0,0 @@
-build/
-test/
-webext/snowflake.js
-snowflake-library.js
-
-# FIXME: Whittle these away
-spec/
-shims.js
diff --git a/proxy/.eslintrc.json b/proxy/.eslintrc.json
deleted file mode 100644
index 406f9e5..0000000
--- a/proxy/.eslintrc.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "env": {
- "browser": true,
- "es6": true
- },
- "extends": "eslint:recommended",
- "rules": {
- "indent": ["error", 2, {
- "SwitchCase": 1,
- "MemberExpression": 0
- }]
- }
-}
diff --git a/proxy/README.md b/proxy/README.md
deleted file mode 100644
index 33b8738..0000000
--- a/proxy/README.md
+++ /dev/null
@@ -1,143 +0,0 @@
-This is the browser proxy component of Snowflake.
-
-### Embedding
-
-See https://snowflake.torproject.org/ for more info:
-```
-<iframe src="https://snowflake.torproject.org/embed.html" width="88" height="16" frameborder="0" scrolling="no"></iframe>
-```
-
-### Building the badge / snowflake.torproject.org
-
-```
-npm install
-npm run build
-```
-
-which outputs to the `build/` directory.
-
-### Building the webextension
-
-```
-npm install
-npm run webext
-```
-
-and then load the `webext/` directory as an unpacked extension.
- * https://developer.mozilla.org/en-US/docs/Tools/about:debugging#Loading_a_te…
- * https://developer.chrome.com/extensions/getstarted#manifest
-
-### Testing
-
-Unit testing with Jasmine are available with:
-```
-npm install
-npm test
-```
-
-To run locally, start an http server in `build/` and navigate to `/embed.html`.
-
-### Preparing to deploy
-
-Background information:
- * https://bugs.torproject.org/23947#comment:8
- * https://help.torproject.org/tsa/doc/static-sites/
- * https://help.torproject.org/tsa/doc/ssh-jump-host/
-
-You need to be in LDAP group "snowflake" and have set up an SSH key with your LDAP account.
-In your ~/.ssh/config file, you should have something like:
-
-```
-Host staticiforme
-HostName staticiforme.torproject.org
-User <your user name>
-ProxyJump people.torproject.org
-IdentityFile ~/.ssh/tor
-```
-
-### Deploying
-
-```
-npm install
-npm run build
-```
-
-Do a "dry run" rsync with `-n` to check that only expected files are being changed. If you don't understand why a file would be updated, you can add the `-i` option to see the reason.
-
-```
-rsync -n --chown=:snowflake --chmod ug=rw,D+x --perms --delete -crv build/ staticiforme:/srv/snowflake.torproject.org/htdocs/
-```
-
-If it looks good, then repeat the rsync without `-n`.
-
-```
-rsync --chown=:snowflake --chmod ug=rw,D+x --perms --delete -crv build/ staticiforme:/srv/snowflake.torproject.org/htdocs/
-```
-
-You can ignore errors of the form `rsync: failed to set permissions on "<dirname>/": Operation not permitted (1)`.
-
-Then run the command to copy the new files to the live web servers:
-
-```
-ssh staticiforme 'static-update-component snowflake.torproject.org'
-```
-
-### Parameters
-
-With no parameters,
-snowflake uses the default relay `snowflake.freehaven.net:443` and
-uses automatic signaling with the default broker at
-`https://snowflake-broker.freehaven.net/`.
-
-### Reuse as a library
-
-The badge and the webextension make use of the same underlying library and
-only differ in their UI. That same library can be produced for use with other
-interfaces, such as [Cupcake][1], by running,
-
-```
-npm install
-npm run library
-```
-
-which outputs a `./snowflake-library.js`.
-
-You'd then want to create a subclass of `UI` to perform various actions as
-the state of the snowflake changes,
-
-```
-class MyUI extends UI {
- ...
-}
-```
-
-See `WebExtUI` in `init-webext.js` and `BadgeUI` in `init-badge.js` for
-examples.
-
-Finally, initialize the snowflake with,
-
-```
-var log = function(msg) {
- return console.log('Snowflake: ' + msg);
-};
-var dbg = log;
-
-var config = new Config("myui"); // NOTE: Set a unique proxy type for metrics
-var ui = new MyUI(); // NOTE: Using the class defined above
-var broker = new Broker(config.brokerUrl);
-
-var snowflake = new Snowflake(config, ui, broker);
-
-snowflake.setRelayAddr(config.relayAddr);
-snowflake.beginWebRTC();
-```
-
-This minimal setup is pretty much what's currently in `init-node.js`.
-
-When configuring the snowflake, set a unique `proxyType` (first argument
-to `Config`) that will be used when recording metrics at the broker. Also,
-it would be helpful to get in touch with the [Anti-Censorship Team][2] at the
-Tor Project to let them know about your tool.
-
-[1]: https://chrome.google.com/webstore/detail/cupcake/dajjbehmbnbppjkcnpdkaniap…
-[2]: https://trac.torproject.org/projects/tor/wiki/org/teams/AntiCensorshipTeam
diff --git a/proxy/broker.js b/proxy/broker.js
deleted file mode 100644
index 42293ae..0000000
--- a/proxy/broker.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/* global log, dbg, snowflake */
-
-/*
-Communication with the snowflake broker.
-
-Browser snowflakes must register with the broker in order
-to get assigned to clients.
-*/
-
-// Represents a broker running remotely.
-class Broker {
-
- // When interacting with the Broker, snowflake must generate a unique session
- // ID so the Broker can keep track of each proxy's signalling channels.
- // On construction, this Broker object does not do anything until
- // |getClientOffer| is called.
- constructor(config) {
- this.getClientOffer = this.getClientOffer.bind(this);
- this._postRequest = this._postRequest.bind(this);
-
- this.config = config
- this.url = config.brokerUrl;
- this.clients = 0;
- if (0 === this.url.indexOf('localhost', 0)) {
- // Ensure url has the right protocol + trailing slash.
- this.url = 'http://' + this.url;
- }
- if (0 !== this.url.indexOf('http', 0)) {
- this.url = 'https://' + this.url;
- }
- if ('/' !== this.url.substr(-1)) {
- this.url += '/';
- }
- }
-
- // Promises some client SDP Offer.
- // Registers this Snowflake with the broker using an HTTP POST request, and
- // waits for a response containing some client offer that the Broker chooses
- // for this proxy..
- // TODO: Actually support multiple clients.
- getClientOffer(id) {
- return new Promise((fulfill, reject) => {
- var xhr;
- xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function() {
- if (xhr.DONE !== xhr.readyState) {
- return;
- }
- switch (xhr.status) {
- case Broker.CODE.OK:
- var response = JSON.parse(xhr.responseText);
- if (response.Status == Broker.STATUS.MATCH) {
- return fulfill(response.Offer); // Should contain offer.
- } else if (response.Status == Broker.STATUS.TIMEOUT) {
- return reject(Broker.MESSAGE.TIMEOUT);
- } else {
- log('Broker ERROR: Unexpected ' + response.Status);
- return reject(Broker.MESSAGE.UNEXPECTED);
- }
- default:
- log('Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText);
- snowflake.ui.setStatus(' failure. Please refresh.');
- return reject(Broker.MESSAGE.UNEXPECTED);
- }
- };
- this._xhr = xhr; // Used by spec to fake async Broker interaction
- var data = {"Version": "1.1", "Sid": id, "Type": this.config.proxyType}
- return this._postRequest(xhr, 'proxy', JSON.stringify(data));
- });
- }
-
- // Assumes getClientOffer happened, and a WebRTC SDP answer has been generated.
- // Sends it back to the broker, which passes it to back to the original client.
- sendAnswer(id, answer) {
- var xhr;
- dbg(id + ' - Sending answer back to broker...\n');
- dbg(answer.sdp);
- xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function() {
- if (xhr.DONE !== xhr.readyState) {
- return;
- }
- switch (xhr.status) {
- case Broker.CODE.OK:
- dbg('Broker: Successfully replied with answer.');
- return dbg(xhr.responseText);
- default:
- dbg('Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText);
- return snowflake.ui.setStatus(' failure. Please refresh.');
- }
- };
- var data = {"Version": "1.0", "Sid": id, "Answer": JSON.stringify(answer)};
- return this._postRequest(xhr, 'answer', JSON.stringify(data));
- }
-
- // urlSuffix for the broker is different depending on what action
- // is desired.
- _postRequest(xhr, urlSuffix, payload) {
- var err;
- try {
- xhr.open('POST', this.url + urlSuffix);
- } catch (error) {
- err = error;
- /*
- An exception happens here when, for example, NoScript allows the domain
- on which the proxy badge runs, but not the domain to which it's trying
- to make the HTTP xhr. The exception message is like "Component
- returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox.
- */
- log('Broker: exception while connecting: ' + err.message);
- return;
- }
- return xhr.send(payload);
- }
-
-}
-
-Broker.CODE = {
- OK: 200,
- BAD_REQUEST: 400,
- INTERNAL_SERVER_ERROR: 500
-};
-
-Broker.STATUS = {
- MATCH: "client match",
- TIMEOUT: "no match"
-};
-
-Broker.MESSAGE = {
- TIMEOUT: 'Timed out waiting for a client offer.',
- UNEXPECTED: 'Unexpected status.'
-};
-
-Broker.prototype.clients = 0;
diff --git a/proxy/config.js b/proxy/config.js
deleted file mode 100644
index 39c2b15..0000000
--- a/proxy/config.js
+++ /dev/null
@@ -1,40 +0,0 @@
-
-class Config {
- constructor(proxyType) {
- this.proxyType = proxyType || '';
- }
-}
-
-Config.prototype.brokerUrl = 'snowflake-broker.freehaven.net';
-
-Config.prototype.relayAddr = {
- host: 'snowflake.freehaven.net',
- port: '443'
-};
-
-// Original non-wss relay:
-// host: '192.81.135.242'
-// port: 9902
-Config.prototype.cookieName = "snowflake-allow";
-
-// Bytes per second. Set to undefined to disable limit.
-Config.prototype.rateLimitBytes = void 0;
-
-Config.prototype.minRateLimit = 10 * 1024;
-
-Config.prototype.rateLimitHistory = 5.0;
-
-Config.prototype.defaultBrokerPollInterval = 300.0 * 1000;
-
-Config.prototype.maxNumClients = 1;
-
-Config.prototype.proxyType = "";
-
-// TODO: Different ICE servers.
-Config.prototype.pcConfig = {
- iceServers: [
- {
- urls: ['stun:stun.l.google.com:19302']
- }
- ]
-};
diff --git a/proxy/init-badge.js b/proxy/init-badge.js
deleted file mode 100644
index cb066e8..0000000
--- a/proxy/init-badge.js
+++ /dev/null
@@ -1,223 +0,0 @@
-/* global Util, Params, Config, UI, Broker, Snowflake, Popup, Parse, availableLangs, WS */
-
-/*
-UI
-*/
-
-class Messages {
- constructor(json) {
- this.json = json;
- }
- getMessage(m, ...rest) {
- let message = this.json[m].message;
- return message.replace(/\$(\d+)/g, (...args) => {
- return rest[Number(args[1]) - 1];
- });
- }
-}
-
-let messages = null;
-
-class BadgeUI extends UI {
-
- constructor() {
- super();
- this.popup = new Popup();
- }
-
- setStatus() {}
-
- missingFeature(missing) {
- this.popup.setEnabled(false);
- this.popup.setActive(false);
- this.popup.setStatusText(messages.getMessage('popupStatusOff'));
- this.setIcon('off');
- this.popup.setStatusDesc(missing, true);
- this.popup.hideButton();
- }
-
- turnOn() {
- const clients = this.active ? 1 : 0;
- this.popup.setChecked(true);
- if (clients > 0) {
- this.popup.setStatusText(messages.getMessage('popupStatusOn', String(clients)));
- this.setIcon('running');
- } else {
- this.popup.setStatusText(messages.getMessage('popupStatusReady'));
- this.setIcon('on');
- }
- // FIXME: Share stats from webext
- this.popup.setStatusDesc('');
- this.popup.setEnabled(true);
- this.popup.setActive(this.active);
- }
-
- turnOff() {
- this.popup.setChecked(false);
- this.popup.setStatusText(messages.getMessage('popupStatusOff'));
- this.setIcon('off');
- this.popup.setStatusDesc('');
- this.popup.setEnabled(false);
- this.popup.setActive(false);
- }
-
- setActive(connected) {
- super.setActive(connected);
- this.turnOn();
- }
-
- setIcon(status) {
- document.getElementById('icon').href = `assets/toolbar-${status}.ico`;
- }
-
-}
-
-BadgeUI.prototype.popup = null;
-
-
-/*
-Entry point.
-*/
-
-// Defaults to opt-in.
-var COOKIE_NAME = "snowflake-allow";
-var COOKIE_LIFETIME = "Thu, 01 Jan 2038 00:00:00 GMT";
-var COOKIE_EXPIRE = "Thu, 01 Jan 1970 00:00:01 GMT";
-
-function setSnowflakeCookie(val, expires) {
- document.cookie = `${COOKIE_NAME}=${val}; path=/; expires=${expires};`;
-}
-
-const defaultLang = 'en_US';
-
-// Resolve as in,
-// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Inte…
-function getLang() {
- let lang = navigator.language || defaultLang;
- lang = lang.replace(/-/g, '_');
- if (availableLangs.has(lang)) {
- return lang;
- }
- lang = lang.split('_')[0];
- if (availableLangs.has(lang)) {
- return lang;
- }
- return defaultLang;
-}
-
-var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotifications, query;
-
-(function() {
-
- snowflake = null;
-
- query = new URLSearchParams(location.search);
-
- debug = Params.getBool(query, 'debug', false);
-
- silenceNotifications = Params.getBool(query, 'silent', false);
-
- // Log to both console and UI if applicable.
- // Requires that the snowflake and UI objects are hooked up in order to
- // log to console.
- log = function(msg) {
- console.log('Snowflake: ' + msg);
- return snowflake != null ? snowflake.ui.log(msg) : void 0;
- };
-
- dbg = function(msg) {
- if (debug) { log(msg); }
- };
-
- update = function() {
- const cookies = Parse.cookie(document.cookie);
- if (cookies[COOKIE_NAME] !== '1') {
- ui.turnOff();
- snowflake.disable();
- log('Currently not active.');
- return;
- }
-
- if (!Util.hasWebRTC()) {
- ui.missingFeature(messages.getMessage('popupWebRTCOff'));
- snowflake.disable();
- return;
- }
-
- WS.probeWebsocket(config.relayAddr)
- .then(
- () => {
- ui.turnOn();
- dbg('Contacting Broker at ' + broker.url);
- log('Starting snowflake');
- snowflake.setRelayAddr(config.relayAddr);
- snowflake.beginWebRTC();
- },
- () => {
- ui.missingFeature(messages.getMessage('popupBridgeUnreachable'));
- snowflake.disable();
- log('Could not connect to bridge.');
- }
- );
- };
-
- init = function() {
- ui = new BadgeUI();
-
- if (!Util.hasCookies()) {
- ui.missingFeature(messages.getMessage('badgeCookiesOff'));
- return;
- }
-
- config = new Config("badge");
- if ('off' !== query.get('ratelimit')) {
- config.rateLimitBytes = Params.getByteCount(query, 'ratelimit', config.rateLimitBytes);
- }
- broker = new Broker(config);
- snowflake = new Snowflake(config, ui, broker);
- log('== snowflake proxy ==');
- update();
-
- document.getElementById('enabled').addEventListener('change', (event) => {
- if (event.target.checked) {
- setSnowflakeCookie('1', COOKIE_LIFETIME);
- } else {
- setSnowflakeCookie('', COOKIE_EXPIRE);
- }
- update();
- })
- };
-
- // Notification of closing tab with active proxy.
- window.onbeforeunload = function() {
- if (
- !silenceNotifications &&
- snowflake !== null &&
- ui.active
- ) {
- return Snowflake.MESSAGE.CONFIRMATION;
- }
- return null;
- };
-
- window.onunload = function() {
- if (snowflake !== null) { snowflake.disable(); }
- return null;
- };
-
- window.onload = function() {
- fetch(`./_locales/${getLang()}/messages.json`)
- .then((res) => {
- if (!res.ok) { return; }
- return res.json();
- })
- .then((json) => {
- messages = new Messages(json);
- Popup.fill(document.body, (m) => {
- return messages.getMessage(m);
- });
- init();
- });
- }
-
-}());
diff --git a/proxy/init-node.js b/proxy/init-node.js
deleted file mode 100644
index b5a60d8..0000000
--- a/proxy/init-node.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/* global Config, UI, Broker, Snowflake */
-
-/*
-Entry point.
-*/
-
-var config = new Config("node");
-
-var ui = new UI();
-
-var broker = new Broker(config);
-
-var snowflake = new Snowflake(config, ui, broker);
-
-var log = function(msg) {
- return console.log('Snowflake: ' + msg);
-};
-
-var dbg = log;
-
-log('== snowflake proxy ==');
-
-dbg('Contacting Broker at ' + broker.url);
-
-snowflake.setRelayAddr(config.relayAddr);
-
-snowflake.beginWebRTC();
diff --git a/proxy/init-testing.js b/proxy/init-testing.js
deleted file mode 100644
index 01b6147..0000000
--- a/proxy/init-testing.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/* global TESTING, Util, Params, Config, UI, Broker, Snowflake */
-
-/*
-UI
-*/
-
-class DebugUI extends UI {
-
- constructor() {
- super();
- // Setup other DOM handlers if it's debug mode.
- this.$status = document.getElementById('status');
- this.$msglog = document.getElementById('msglog');
- this.$msglog.value = '';
- }
-
- // Status bar
- setStatus(msg) {
- var txt;
- txt = document.createTextNode('Status: ' + msg);
- while (this.$status.firstChild) {
- this.$status.removeChild(this.$status.firstChild);
- }
- return this.$status.appendChild(txt);
- }
-
- setActive(connected) {
- super.setActive(connected);
- return this.$msglog.className = connected ? 'active' : '';
- }
-
- log(msg) {
- // Scroll to latest
- this.$msglog.value += msg + '\n';
- return this.$msglog.scrollTop = this.$msglog.scrollHeight;
- }
-
-}
-
-// DOM elements references.
-DebugUI.prototype.$msglog = null;
-
-DebugUI.prototype.$status = null;
-
-/*
-Entry point.
-*/
-
-var snowflake, query, debug, ui, silenceNotifications, log, dbg, init;
-
-(function() {
-
- if (((typeof TESTING === "undefined" || TESTING === null) || !TESTING) && !Util.featureDetect()) {
- console.log('webrtc feature not detected. shutting down');
- return;
- }
-
- snowflake = null;
-
- query = new URLSearchParams(location.search);
-
- debug = Params.getBool(query, 'debug', false);
-
- silenceNotifications = Params.getBool(query, 'silent', false);
-
- // Log to both console and UI if applicable.
- // Requires that the snowflake and UI objects are hooked up in order to
- // log to console.
- log = function(msg) {
- console.log('Snowflake: ' + msg);
- return snowflake != null ? snowflake.ui.log(msg) : void 0;
- };
-
- dbg = function(msg) {
- if (debug || ((snowflake != null ? snowflake.ui : void 0) instanceof DebugUI)) {
- return log(msg);
- }
- };
-
- init = function() {
- var broker, config, ui;
- config = new Config("testing");
- if ('off' !== query['ratelimit']) {
- config.rateLimitBytes = Params.getByteCount(query, 'ratelimit', config.rateLimitBytes);
- }
- ui = null;
- if (document.getElementById('status') !== null) {
- ui = new DebugUI();
- } else {
- ui = new UI();
- }
- broker = new Broker(config);
- snowflake = new Snowflake(config, ui, broker);
- log('== snowflake proxy ==');
- if (Util.snowflakeIsDisabled(config.cookieName)) {
- // Do not activate the proxy if any number of conditions are true.
- log('Currently not active.');
- return;
- }
- // Otherwise, begin setting up WebRTC and acting as a proxy.
- dbg('Contacting Broker at ' + broker.url);
- snowflake.setRelayAddr(config.relayAddr);
- return snowflake.beginWebRTC();
- };
-
- // Notification of closing tab with active proxy.
- window.onbeforeunload = function() {
- if (
- !silenceNotifications &&
- snowflake !== null &&
- ui.active
- ) {
- return Snowflake.MESSAGE.CONFIRMATION;
- }
- return null;
- };
-
- window.onunload = function() {
- if (snowflake !== null) { snowflake.disable(); }
- return null;
- };
-
- window.onload = init;
-
-}());
diff --git a/proxy/init-webext.js b/proxy/init-webext.js
deleted file mode 100644
index 3eb42dd..0000000
--- a/proxy/init-webext.js
+++ /dev/null
@@ -1,203 +0,0 @@
-/* global Util, chrome, Config, UI, Broker, Snowflake, WS */
-/* eslint no-unused-vars: 0 */
-
-/*
-UI
-*/
-
-class WebExtUI extends UI {
-
- constructor() {
- super();
- this.onConnect = this.onConnect.bind(this);
- this.onMessage = this.onMessage.bind(this);
- this.onDisconnect = this.onDisconnect.bind(this);
- this.initStats();
- chrome.runtime.onConnect.addListener(this.onConnect);
- }
-
- initStats() {
- this.stats = [0];
- setInterval((() => {
- this.stats.unshift(0);
- this.stats.splice(24);
- this.postActive();
- }), 60 * 60 * 1000);
- }
-
- initToggle() {
- // First, check if we have our status stored
- (new Promise((resolve) => {
- chrome.storage.local.get(["snowflake-enabled"], resolve);
- }))
- .then((result) => {
- let enabled = this.enabled;
- if (result['snowflake-enabled'] !== void 0) {
- enabled = result['snowflake-enabled'];
- } else {
- log("Toggle state not yet saved");
- }
- // If it isn't enabled, stop
- if (!enabled) {
- this.setEnabled(enabled);
- return;
- }
- // Otherwise, do feature checks
- if (!Util.hasWebRTC()) {
- this.missingFeature = 'popupWebRTCOff';
- this.setEnabled(false);
- return;
- }
- WS.probeWebsocket(config.relayAddr)
- .then(
- () => {
- this.setEnabled(true);
- },
- () => {
- log('Could not connect to bridge.');
- this.missingFeature = 'popupBridgeUnreachable';
- this.setEnabled(false);
- }
- );
- });
- }
-
- postActive() {
- this.setIcon();
- if (!this.port) { return; }
- this.port.postMessage({
- active: this.active,
- total: this.stats.reduce((function(t, c) {
- return t + c;
- }), 0),
- enabled: this.enabled,
- missingFeature: this.missingFeature,
- });
- }
-
- onConnect(port) {
- this.port = port;
- port.onDisconnect.addListener(this.onDisconnect);
- port.onMessage.addListener(this.onMessage);
- this.postActive();
- }
-
- onMessage(m) {
- (new Promise((resolve) => {
- chrome.storage.local.set({ "snowflake-enabled": m.enabled }, resolve);
- }))
- .then(() => {
- log("Stored toggle state");
- this.initToggle();
- });
- }
-
- onDisconnect() {
- this.port = null;
- }
-
- setActive(connected) {
- super.setActive(connected);
- if (connected) {
- this.stats[0] += 1;
- }
- this.postActive();
- }
-
- setEnabled(enabled) {
- this.enabled = enabled;
- this.postActive();
- update();
- }
-
- setIcon() {
- let path = null;
- if (!this.enabled) {
- path = {
- 48: "assets/toolbar-off-48.png",
- 96: "assets/toolbar-off-96.png"
- };
- } else if (this.active) {
- path = {
- 48: "assets/toolbar-running-48.png",
- 96: "assets/toolbar-running-96.png"
- };
- } else {
- path = {
- 48: "assets/toolbar-on-48.png",
- 96: "assets/toolbar-on-96.png"
- };
- }
- chrome.browserAction.setIcon({
- path: path,
- });
- }
-
-}
-
-WebExtUI.prototype.port = null;
-
-WebExtUI.prototype.stats = null;
-
-WebExtUI.prototype.enabled = true;
-
-/*
-Entry point.
-*/
-
-var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotifications;
-
-(function () {
-
- silenceNotifications = false;
- debug = false;
- snowflake = null;
- config = null;
- broker = null;
- ui = null;
-
- // Log to both console and UI if applicable.
- // Requires that the snowflake and UI objects are hooked up in order to
- // log to console.
- log = function(msg) {
- console.log('Snowflake: ' + msg);
- return snowflake != null ? snowflake.ui.log(msg) : void 0;
- };
-
- dbg = function(msg) {
- if (debug) {
- return log(msg);
- }
- };
-
- init = function() {
- config = new Config("webext");
- ui = new WebExtUI();
- broker = new Broker(config);
- snowflake = new Snowflake(config, ui, broker);
- log('== snowflake proxy ==');
- ui.initToggle();
- };
-
- update = function() {
- if (!ui.enabled) {
- // Do not activate the proxy if any number of conditions are true.
- snowflake.disable();
- log('Currently not active.');
- return;
- }
- // Otherwise, begin setting up WebRTC and acting as a proxy.
- dbg('Contacting Broker at ' + broker.url);
- log('Starting snowflake');
- snowflake.setRelayAddr(config.relayAddr);
- return snowflake.beginWebRTC();
- };
-
- window.onunload = function() {
- if (snowflake !== null) { snowflake.disable(); }
- return null;
- };
-
- window.onload = init;
-
-}());
diff --git a/proxy/make.js b/proxy/make.js
deleted file mode 100755
index 6111913..0000000
--- a/proxy/make.js
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/env node
-
-/* global require, process */
-
-var { writeFileSync, readdirSync, statSync } = require('fs');
-var { execSync, spawn } = require('child_process');
-var cldr = require('cldr');
-
-// All files required.
-var FILES = [
- 'broker.js',
- 'config.js',
- 'proxypair.js',
- 'snowflake.js',
- 'ui.js',
- 'util.js',
- 'websocket.js',
- 'shims.js'
-];
-
-var FILES_SPEC = [
- 'spec/broker.spec.js',
- 'spec/init.spec.js',
- 'spec/proxypair.spec.js',
- 'spec/snowflake.spec.js',
- 'spec/ui.spec.js',
- 'spec/util.spec.js',
- 'spec/websocket.spec.js'
-];
-
-var STATIC = 'static';
-
-var SHARED_FILES = [
- 'embed.html',
- 'embed.css',
- 'popup.js',
- 'assets',
- '_locales',
-];
-
-var concatJS = function(outDir, init, outFile, pre) {
- var files = FILES;
- if (init) {
- files = files.concat(`init-${init}.js`);
- }
- var outPath = `${outDir}/${outFile}`;
- writeFileSync(outPath, pre, 'utf8');
- execSync(`cat ${files.join(' ')} >> ${outPath}`);
-};
-
-var copyTranslations = function(outDir) {
- execSync('git submodule update --init -- translation')
- execSync(`cp -rf translation/* ${outDir}/_locales/`);
-};
-
-var getDisplayName = function(locale) {
- var code = locale.split("_")[0];
- try {
- var name = cldr.extractLanguageDisplayNames(code)[code];
- }
- catch(e) {
- return '';
- }
- if (name === undefined) {
- return '';
- }
- return name;
-}
-
-var availableLangs = function() {
- let out = "const availableLangs = new Set([\n";
- let dirs = readdirSync('translation').filter((f) => {
- const s = statSync(`translation/${f}`);
- return s.isDirectory();
- });
- dirs.push('en_US');
- dirs.sort();
- dirs = dirs.map(d => ` '${d}',`);
- out += dirs.join("\n");
- out += "\n]);\n\n";
- return out;
-};
-
-var translatedLangs = function() {
- let out = "const availableLangs = {\n";
- let dirs = readdirSync('translation').filter((f) => {
- const s = statSync(`translation/${f}`);
- return s.isDirectory();
- });
- dirs.push('en_US');
- dirs.sort();
- dirs = dirs.map(d => `'${d}': {"name": '${getDisplayName(d)}'},`);
- out += dirs.join("\n");
- out += "\n};\n\n";
- return out;
-};
-var tasks = new Map();
-
-var task = function(key, msg, func) {
- tasks.set(key, {
- msg, func
- });
-};
-
-task('test', 'snowflake unit tests', function() {
- var jasmineFiles, outFile, proc;
- execSync('mkdir -p test');
- execSync('jasmine init >&-');
- // Simply concat all the files because we're not using node exports.
- jasmineFiles = FILES.concat('init-testing.js', FILES_SPEC);
- outFile = 'test/bundle.spec.js';
- execSync('echo "TESTING = true" > ' + outFile);
- execSync('cat ' + jasmineFiles.join(' ') + ' | cat >> ' + outFile);
- proc = spawn('jasmine', ['test/bundle.spec.js'], {
- stdio: 'inherit'
- });
- proc.on("exit", function(code) {
- process.exit(code);
- });
-});
-
-task('build', 'build the snowflake proxy', function() {
- const outDir = 'build';
- execSync(`rm -rf ${outDir}`);
- execSync(`cp -r ${STATIC}/ ${outDir}/`);
- copyTranslations(outDir);
- concatJS(outDir, 'badge', 'embed.js', availableLangs());
- writeFileSync(`${outDir}/index.js`, translatedLangs(), 'utf8');
- execSync(`cat ${STATIC}/index.js >> ${outDir}/index.js`);
- console.log('Snowflake prepared.');
-});
-
-task('webext', 'build the webextension', function() {
- const outDir = 'webext';
- execSync(`git clean -f -x -d ${outDir}/`);
- execSync(`cp -r ${STATIC}/{${SHARED_FILES.join(',')}} ${outDir}/`, { shell: '/bin/bash' });
- copyTranslations(outDir);
- concatJS(outDir, 'webext', 'snowflake.js', '');
- console.log('Webextension prepared.');
-});
-
-task('node', 'build the node binary', function() {
- execSync('mkdir -p build');
- concatJS('build', 'node', 'snowflake.js', '');
- console.log('Node prepared.');
-});
-
-task('pack-webext', 'pack the webextension for deployment', function() {
- try {
- execSync(`rm -f source.zip`);
- execSync(`rm -f webext/webext.zip`);
- } catch (error) {
- //Usually this happens because the zip files were removed previously
- console.log('Error removing zip files');
- }
- execSync(`git submodule update --remote`);
- var version = process.argv[3];
- console.log(version);
- var manifest = require('./webext/manifest.json')
- manifest.version = version;
- writeFileSync('./webext/manifest.json', JSON.stringify(manifest, null, 2), 'utf8');
- execSync(`git commit -am "bump version to ${version}"`);
- try {
- execSync(`git tag webext-${version}`);
- } catch (error) {
- console.log('Error creating git tag');
- // Revert changes
- execSync(`git reset HEAD~`);
- execSync(`git checkout ./webext/manifest.json`);
- execSync(`git submodule update`);
- return;
- }
- execSync(`git archive -o source.zip HEAD .`);
- execSync(`npm run webext`);
- execSync(`cd webext && zip -Xr webext.zip ./*`);
-});
-
-task('clean', 'remove all built files', function() {
- execSync('rm -rf build test spec/support');
-});
-
-task('library', 'build the library', function() {
- concatJS('.', '', 'snowflake-library.js', '');
- console.log('Library prepared.');
-});
-
-var cmd = process.argv[2];
-
-if (tasks.has(cmd)) {
- var t = tasks.get(cmd);
- console.log(t.msg);
- t.func();
-} else {
- console.error('Command not supported.');
-
- console.log('Commands:');
-
- tasks.forEach(function(value, key) {
- console.log(key + ' - ' + value.msg);
- })
-}
diff --git a/proxy/package.json b/proxy/package.json
deleted file mode 100644
index 772746e..0000000
--- a/proxy/package.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name": "snowflake-pt",
- "version": "0.0.0-git",
- "description": "Snowflake is a WebRTC pluggable transport for Tor.",
- "main": "build/snowflake.js",
- "directories": {
- "test": "test"
- },
- "scripts": {
- "test": "node make.js test",
- "build": "node make.js build",
- "webext": "node make.js webext",
- "library": "node make.js library",
- "pack-webext": "node make.js pack-webext",
- "clean": "node make.js clean",
- "prepublish": "node make.js node",
- "start": "node build/snowflake.js",
- "lint": "eslint . --ext .js"
- },
- "bin": {
- "snowflake": "build/snowflake.js"
- },
- "author": "Serene Han",
- "license": "BSD-3-Clause",
- "devDependencies": {
- "eslint": "^6.0.1",
- "jasmine": "2.5.2"
- },
- "dependencies": {
- "cldr": "^5.4.1",
- "wrtc": "^0.0.61",
- "ws": "^3.3.1",
- "xmlhttprequest": "^1.8.0"
- }
-}
diff --git a/proxy/proxypair.js b/proxy/proxypair.js
deleted file mode 100644
index 25eaa9d..0000000
--- a/proxy/proxypair.js
+++ /dev/null
@@ -1,249 +0,0 @@
-/* global snowflake, log, dbg, Util, PeerConnection, Parse, WS */
-
-/*
-Represents a single:
-
- client <-- webrtc --> snowflake <-- websocket --> relay
-
-Every ProxyPair has a Snowflake ID, which is necessary when responding to the
-Broker with an WebRTC answer.
-*/
-
-class ProxyPair {
-
- /*
- Constructs a ProxyPair where:
- - @relayAddr is the destination relay
- - @rateLimit specifies a rate limit on traffic
- */
- constructor(relayAddr, rateLimit, pcConfig) {
- this.prepareDataChannel = this.prepareDataChannel.bind(this);
- this.connectRelay = this.connectRelay.bind(this);
- this.onClientToRelayMessage = this.onClientToRelayMessage.bind(this);
- this.onRelayToClientMessage = this.onRelayToClientMessage.bind(this);
- this.onError = this.onError.bind(this);
- this.flush = this.flush.bind(this);
-
- this.relayAddr = relayAddr;
- this.rateLimit = rateLimit;
- this.pcConfig = pcConfig;
- this.id = Util.genSnowflakeID();
- this.c2rSchedule = [];
- this.r2cSchedule = [];
- }
-
- // Prepare a WebRTC PeerConnection and await for an SDP offer.
- begin() {
- this.pc = new PeerConnection(this.pcConfig, {
- optional: [
- {
- DtlsSrtpKeyAgreement: true
- },
- {
- RtpDataChannels: false
- }
- ]
- });
- this.pc.onicecandidate = (evt) => {
- // Browser sends a null candidate once the ICE gathering completes.
- if (null === evt.candidate) {
- // TODO: Use a promise.all to tell Snowflake about all offers at once,
- // once multiple proxypairs are supported.
- dbg('Finished gathering ICE candidates.');
- return snowflake.broker.sendAnswer(this.id, this.pc.localDescription);
- }
- };
- // OnDataChannel triggered remotely from the client when connection succeeds.
- return this.pc.ondatachannel = (dc) => {
- var channel;
- channel = dc.channel;
- dbg('Data Channel established...');
- this.prepareDataChannel(channel);
- return this.client = channel;
- };
- }
-
- receiveWebRTCOffer(offer) {
- if ('offer' !== offer.type) {
- log('Invalid SDP received -- was not an offer.');
- return false;
- }
- try {
- this.pc.setRemoteDescription(offer);
- } catch (error) {
- log('Invalid SDP message.');
- return false;
- }
- dbg('SDP ' + offer.type + ' successfully received.');
- return true;
- }
-
- // Given a WebRTC DataChannel, prepare callbacks.
- prepareDataChannel(channel) {
- channel.onopen = () => {
- log('WebRTC DataChannel opened!');
- snowflake.ui.setActive(true);
- // This is the point when the WebRTC datachannel is done, so the next step
- // is to establish websocket to the server.
- return this.connectRelay();
- };
- channel.onclose = () => {
- log('WebRTC DataChannel closed.');
- snowflake.ui.setStatus('disconnected by webrtc.');
- snowflake.ui.setActive(false);
- this.flush();
- return this.close();
- };
- channel.onerror = function() {
- return log('Data channel error!');
- };
- channel.binaryType = "arraybuffer";
- return channel.onmessage = this.onClientToRelayMessage;
- }
-
- // Assumes WebRTC datachannel is connected.
- connectRelay() {
- var params, peer_ip, ref;
- dbg('Connecting to relay...');
- // Get a remote IP address from the PeerConnection, if possible. Add it to
- // the WebSocket URL's query string if available.
- // MDN marks remoteDescription as "experimental". However the other two
- // options, currentRemoteDescription and pendingRemoteDescription, which
- // are not marked experimental, were undefined when I tried them in Firefox
- // 52.2.0.
- // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/remoteDe…
- peer_ip = Parse.ipFromSDP((ref = this.pc.remoteDescription) != null ? ref.sdp : void 0);
- params = [];
- if (peer_ip != null) {
- params.push(["client_ip", peer_ip]);
- }
- var relay = this.relay = WS.makeWebsocket(this.relayAddr, params);
- this.relay.label = 'websocket-relay';
- this.relay.onopen = () => {
- if (this.timer) {
- clearTimeout(this.timer);
- this.timer = 0;
- }
- log(relay.label + ' connected!');
- return snowflake.ui.setStatus('connected');
- };
- this.relay.onclose = () => {
- log(relay.label + ' closed.');
- snowflake.ui.setStatus('disconnected.');
- snowflake.ui.setActive(false);
- this.flush();
- return this.close();
- };
- this.relay.onerror = this.onError;
- this.relay.onmessage = this.onRelayToClientMessage;
- // TODO: Better websocket timeout handling.
- return this.timer = setTimeout((() => {
- if (0 === this.timer) {
- return;
- }
- log(relay.label + ' timed out connecting.');
- return relay.onclose();
- }), 5000);
- }
-
- // WebRTC --> websocket
- onClientToRelayMessage(msg) {
- dbg('WebRTC --> websocket data: ' + msg.data.byteLength + ' bytes');
- this.c2rSchedule.push(msg.data);
- return this.flush();
- }
-
- // websocket --> WebRTC
- onRelayToClientMessage(event) {
- dbg('websocket --> WebRTC data: ' + event.data.byteLength + ' bytes');
- this.r2cSchedule.push(event.data);
- return this.flush();
- }
-
- onError(event) {
- var ws;
- ws = event.target;
- log(ws.label + ' error.');
- return this.close();
- }
-
- // Close both WebRTC and websocket.
- close() {
- if (this.timer) {
- clearTimeout(this.timer);
- this.timer = 0;
- }
- if (this.webrtcIsReady()) {
- this.client.close();
- }
- if (this.peerConnOpen()) {
- this.pc.close();
- }
- if (this.relayIsReady()) {
- this.relay.close();
- }
- this.onCleanup();
- }
-
- // Send as much data in both directions as the rate limit currently allows.
- flush() {
- var busy, checkChunks;
- if (this.flush_timeout_id) {
- clearTimeout(this.flush_timeout_id);
- }
- this.flush_timeout_id = null;
- busy = true;
- checkChunks = () => {
- var chunk;
- busy = false;
- // WebRTC --> websocket
- if (this.relayIsReady() && this.relay.bufferedAmount < this.MAX_BUFFER && this.c2rSchedule.length > 0) {
- chunk = this.c2rSchedule.shift();
- this.rateLimit.update(chunk.byteLength);
- this.relay.send(chunk);
- busy = true;
- }
- // websocket --> WebRTC
- if (this.webrtcIsReady() && this.client.bufferedAmount < this.MAX_BUFFER && this.r2cSchedule.length > 0) {
- chunk = this.r2cSchedule.shift();
- this.rateLimit.update(chunk.byteLength);
- this.client.send(chunk);
- return busy = true;
- }
- };
- while (busy && !this.rateLimit.isLimited()) {
- checkChunks();
- }
- if (this.r2cSchedule.length > 0 || this.c2rSchedule.length > 0 || (this.relayIsReady() && this.relay.bufferedAmount > 0) || (this.webrtcIsReady() && this.client.bufferedAmount > 0)) {
- return this.flush_timeout_id = setTimeout(this.flush, this.rateLimit.when() * 1000);
- }
- }
-
- webrtcIsReady() {
- return null !== this.client && 'open' === this.client.readyState;
- }
-
- relayIsReady() {
- return (null !== this.relay) && (WebSocket.OPEN === this.relay.readyState);
- }
-
- isClosed(ws) {
- return void 0 === ws || WebSocket.CLOSED === ws.readyState;
- }
-
- peerConnOpen() {
- return (null !== this.pc) && ('closed' !== this.pc.connectionState);
- }
-
-}
-
-ProxyPair.prototype.MAX_BUFFER = 10 * 1024 * 1024;
-
-ProxyPair.prototype.pc = null;
-ProxyPair.prototype.client = null; // WebRTC Data channel
-ProxyPair.prototype.relay = null; // websocket
-
-ProxyPair.prototype.timer = 0;
-ProxyPair.prototype.flush_timeout_id = null;
-
-ProxyPair.prototype.onCleanup = null;
diff --git a/proxy/shims.js b/proxy/shims.js
deleted file mode 100644
index 5d93183..0000000
--- a/proxy/shims.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/* global module, require */
-
-/*
-WebRTC shims for multiple browsers.
-*/
-
-if (typeof module !== "undefined" && module !== null ? module.exports : void 0) {
- window = {};
- document = {
- getElementById: function() {
- return null;
- }
- };
- chrome = {};
- location = { search: '' };
- ({ URLSearchParams } = require('url'));
- if ((typeof TESTING === "undefined" || TESTING === null) || !TESTING) {
- webrtc = require('wrtc');
- PeerConnection = webrtc.RTCPeerConnection;
- IceCandidate = webrtc.RTCIceCandidate;
- SessionDescription = webrtc.RTCSessionDescription;
- WebSocket = require('ws');
- ({ XMLHttpRequest } = require('xmlhttprequest'));
- }
-} else {
- PeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection;
- IceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate;
- SessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription;
- WebSocket = window.WebSocket;
- XMLHttpRequest = window.XMLHttpRequest;
-}
diff --git a/proxy/snowflake.js b/proxy/snowflake.js
deleted file mode 100644
index 0e9730e..0000000
--- a/proxy/snowflake.js
+++ /dev/null
@@ -1,165 +0,0 @@
-/* global log, dbg, DummyRateLimit, BucketRateLimit, SessionDescription, ProxyPair */
-
-/*
-A JavaScript WebRTC snowflake proxy
-
-Uses WebRTC from the client, and Websocket to the server.
-
-Assume that the webrtc client plugin is always the offerer, in which case
-this proxy must always act as the answerer.
-
-TODO: More documentation
-*/
-
-// Minimum viable snowflake for now - just 1 client.
-class Snowflake {
-
- // Prepare the Snowflake with a Broker (to find clients) and optional UI.
- constructor(config, ui, broker) {
- this.receiveOffer = this.receiveOffer.bind(this);
-
- this.config = config;
- this.ui = ui;
- this.broker = broker;
- this.proxyPairs = [];
- if (void 0 === this.config.rateLimitBytes) {
- this.rateLimit = new DummyRateLimit();
- } else {
- this.rateLimit = new BucketRateLimit(this.config.rateLimitBytes * this.config.rateLimitHistory, this.config.rateLimitHistory);
- }
- this.retries = 0;
- }
-
- // Set the target relay address spec, which is expected to be websocket.
- // TODO: Should potentially fetch the target from broker later, or modify
- // entirely for the Tor-independent version.
- setRelayAddr(relayAddr) {
- this.relayAddr = relayAddr;
- log('Using ' + relayAddr.host + ':' + relayAddr.port + ' as Relay.');
- return true;
- }
-
- // Initialize WebRTC PeerConnection, which requires beginning the signalling
- // process. |pollBroker| automatically arranges signalling.
- beginWebRTC() {
- this.pollBroker();
- return this.pollInterval = setInterval((() => {
- return this.pollBroker();
- }), this.config.defaultBrokerPollInterval);
- }
-
- // Regularly poll Broker for clients to serve until this snowflake is
- // serving at capacity, at which point stop polling.
- pollBroker() {
- var msg, pair, recv;
- // Poll broker for clients.
- pair = this.makeProxyPair();
- if (!pair) {
- log('At client capacity.');
- return;
- }
- log('Polling broker..');
- // Do nothing until a new proxyPair is available.
- msg = 'Polling for client ... ';
- if (this.retries > 0) {
- msg += '[retries: ' + this.retries + ']';
- }
- this.ui.setStatus(msg);
- recv = this.broker.getClientOffer(pair.id);
- recv.then((desc) => {
- if (!this.receiveOffer(pair, desc)) {
- return pair.close();
- }
- //set a timeout for channel creation
- return setTimeout((() => {
- if (!pair.webrtcIsReady()) {
- log('proxypair datachannel timed out waiting for open');
- return pair.close();
- }
- }), 20000); // 20 second timeout
- }, function() {
- //on error, close proxy pair
- return pair.close();
- });
- return this.retries++;
- }
-
- // Receive an SDP offer from some client assigned by the Broker,
- // |pair| - an available ProxyPair.
- receiveOffer(pair, desc) {
- var e, offer, sdp;
- try {
- offer = JSON.parse(desc);
- dbg('Received:\n\n' + offer.sdp + '\n');
- sdp = new SessionDescription(offer);
- if (pair.receiveWebRTCOffer(sdp)) {
- this.sendAnswer(pair);
- return true;
- } else {
- return false;
- }
- } catch (error) {
- e = error;
- log('ERROR: Unable to receive Offer: ' + e);
- return false;
- }
- }
-
- sendAnswer(pair) {
- var fail, next;
- next = function(sdp) {
- dbg('webrtc: Answer ready.');
- return pair.pc.setLocalDescription(sdp).catch(fail);
- };
- fail = function() {
- pair.close();
- return dbg('webrtc: Failed to create or set Answer');
- };
- return pair.pc.createAnswer().then(next).catch(fail);
- }
-
- makeProxyPair() {
- if (this.proxyPairs.length >= this.config.maxNumClients) {
- return null;
- }
- var pair;
- pair = new ProxyPair(this.relayAddr, this.rateLimit, this.config.pcConfig);
- this.proxyPairs.push(pair);
-
- log('Snowflake IDs: ' + (this.proxyPairs.map(function(p) {
- return p.id;
- })).join(' | '));
-
- pair.onCleanup = () => {
- var ind;
- // Delete from the list of proxy pairs.
- ind = this.proxyPairs.indexOf(pair);
- if (ind > -1) {
- return this.proxyPairs.splice(ind, 1);
- }
- };
- pair.begin();
- return pair;
- }
-
- // Stop all proxypairs.
- disable() {
- var results;
- log('Disabling Snowflake.');
- clearInterval(this.pollInterval);
- results = [];
- while (this.proxyPairs.length > 0) {
- results.push(this.proxyPairs.pop().close());
- }
- return results;
- }
-
-}
-
-Snowflake.prototype.relayAddr = null;
-Snowflake.prototype.rateLimit = null;
-Snowflake.prototype.pollInterval = null;
-
-Snowflake.MESSAGE = {
- CONFIRMATION: 'You\'re currently serving a Tor user via Snowflake.'
-};
diff --git a/proxy/spec/broker.spec.js b/proxy/spec/broker.spec.js
deleted file mode 100644
index 28a66c4..0000000
--- a/proxy/spec/broker.spec.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/* global expect, it, describe, spyOn, Broker */
-
-/*
-jasmine tests for Snowflake broker
-*/
-
-// fake xhr
-// class XMLHttpRequest
-class XMLHttpRequest {
- constructor() {
- this.onreadystatechange = null;
- }
- open() {}
- setRequestHeader() {}
- send() {}
-};
-
-XMLHttpRequest.prototype.DONE = 1;
-
-
-describe('Broker', function() {
-
- it('can be created', function() {
- var b;
- var config = new Config;
- config.brokerUrl = 'fake';
- b = new Broker(config);
- expect(b.url).toEqual('https://fake/');
- expect(b.id).not.toBeNull();
- });
-
- describe('getClientOffer', function() {
-
- it('polls and promises a client offer', function(done) {
- var b, poll;
- var config = new Config;
- config.brokerUrl = 'fake';
- b = new Broker(config);
- // fake successful request and response from broker.
- spyOn(b, '_postRequest').and.callFake(function() {
- b._xhr.readyState = b._xhr.DONE;
- b._xhr.status = Broker.CODE.OK;
- b._xhr.responseText = '{"Status":"client match","Offer":"fake offer"}';
- return b._xhr.onreadystatechange();
- });
- poll = b.getClientOffer();
- expect(poll).not.toBeNull();
- expect(b._postRequest).toHaveBeenCalled();
- return poll.then(function(desc) {
- expect(desc).toEqual('fake offer');
- return done();
- }).catch(function() {
- fail('should not reject on Broker.CODE.OK');
- return done();
- });
- });
-
- it('rejects if the broker timed-out', function(done) {
- var b, poll;
- var config = new Config;
- config.brokerUrl = 'fake';
- b = new Broker(config);
- // fake timed-out request from broker
- spyOn(b, '_postRequest').and.callFake(function() {
- b._xhr.readyState = b._xhr.DONE;
- b._xhr.status = Broker.CODE.OK;
- b._xhr.responseText = '{"Status":"no match"}';
- return b._xhr.onreadystatechange();
- });
- poll = b.getClientOffer();
- expect(poll).not.toBeNull();
- expect(b._postRequest).toHaveBeenCalled();
- return poll.then(function(desc) {
- fail('should not fulfill with "Status: no match"');
- return done();
- }, function(err) {
- expect(err).toBe(Broker.MESSAGE.TIMEOUT);
- return done();
- });
- });
-
- it('rejects on any other status', function(done) {
- var b, poll;
- var config = new Config;
- config.brokerUrl = 'fake';
- b = new Broker(config);
- // fake timed-out request from broker
- spyOn(b, '_postRequest').and.callFake(function() {
- b._xhr.readyState = b._xhr.DONE;
- b._xhr.status = 1337;
- return b._xhr.onreadystatechange();
- });
- poll = b.getClientOffer();
- expect(poll).not.toBeNull();
- expect(b._postRequest).toHaveBeenCalled();
- return poll.then(function(desc) {
- fail('should not fulfill on non-OK status');
- return done();
- }, function(err) {
- expect(err).toBe(Broker.MESSAGE.UNEXPECTED);
- expect(b._xhr.status).toBe(1337);
- return done();
- });
-
- });
-
- });
-
- it('responds to the broker with answer', function() {
- var config = new Config;
- config.brokerUrl = 'fake';
- var b = new Broker(config);
- spyOn(b, '_postRequest');
- b.sendAnswer('fake id', 123);
- expect(b._postRequest).toHaveBeenCalledWith(jasmine.any(Object), 'answer', '{"Version":"1.0","Sid":"fake id","Answer":"123"}');
- });
-
- it('POST XMLHttpRequests to the broker', function() {
- var config = new Config;
- config.brokerUrl = 'fake';
- var b = new Broker(config);
- b._xhr = new XMLHttpRequest();
- spyOn(b._xhr, 'open');
- spyOn(b._xhr, 'setRequestHeader');
- spyOn(b._xhr, 'send');
- b._postRequest(b._xhr, 'test', 'data');
- expect(b._xhr.open).toHaveBeenCalled();
- expect(b._xhr.send).toHaveBeenCalled();
- });
-
-});
diff --git a/proxy/spec/init.spec.js b/proxy/spec/init.spec.js
deleted file mode 100644
index 593add9..0000000
--- a/proxy/spec/init.spec.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* global expect, it, describe, Snowflake, UI */
-
-// Fake snowflake to interact with
-
-var snowflake = {
- ui: new UI,
- broker: {
- sendAnswer: function() {}
- }
-};
-
-describe('Init', function() {
-
- it('gives a dialog when closing, only while active', function() {
- silenceNotifications = false;
- ui.setActive(true);
- var msg = window.onbeforeunload();
- expect(ui.active).toBe(true);
- expect(msg).toBe(Snowflake.MESSAGE.CONFIRMATION);
- ui.setActive(false);
- msg = window.onbeforeunload();
- expect(ui.active).toBe(false);
- expect(msg).toBe(null);
- });
-
- it('does not give a dialog when silent flag is on', function() {
- silenceNotifications = true;
- ui.setActive(true);
- var msg = window.onbeforeunload();
- expect(ui.active).toBe(true);
- expect(msg).toBe(null);
- });
-
-});
diff --git a/proxy/spec/proxypair.spec.js b/proxy/spec/proxypair.spec.js
deleted file mode 100644
index f15d6d2..0000000
--- a/proxy/spec/proxypair.spec.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/* global expect, it, describe, spyOn */
-
-/*
-jasmine tests for Snowflake proxypair
-*/
-
-// Replacement for MessageEvent constructor.
-// https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent/MessageEvent
-var MessageEvent = function(type, init) {
- return init;
-};
-
-// Asymmetic matcher that checks that two arrays have the same contents.
-var arrayMatching = function(sample) {
- return {
- asymmetricMatch: function(other) {
- var _, a, b, i, j, len;
- a = new Uint8Array(sample);
- b = new Uint8Array(other);
- if (a.length !== b.length) {
- return false;
- }
- for (i = j = 0, len = a.length; j < len; i = ++j) {
- _ = a[i];
- if (a[i] !== b[i]) {
- return false;
- }
- }
- return true;
- },
- jasmineToString: function() {
- return '<arrayMatchine(' + jasmine.pp(sample) + ')>';
- }
- };
-};
-
-describe('ProxyPair', function() {
-
- var config, destination, fakeRelay, pp, rateLimit;
- fakeRelay = Parse.address('0.0.0.0:12345');
- rateLimit = new DummyRateLimit;
- config = new Config;
- destination = [];
-
- // Using the mock PeerConnection definition from spec/snowflake.spec.js
- var pp = new ProxyPair(fakeRelay, rateLimit, config.pcConfig);
-
- beforeEach(function() {
- return pp.begin();
- });
-
- it('begins webrtc connection', function() {
- return expect(pp.pc).not.toBeNull();
- });
-
- describe('accepts WebRTC offer from some client', function() {
-
- beforeEach(function() {
- return pp.begin();
- });
-
- it('rejects invalid offers', function() {
- expect(typeof pp.pc.setRemoteDescription).toBe("function");
- expect(pp.pc).not.toBeNull();
- expect(pp.receiveWebRTCOffer({})).toBe(false);
- expect(pp.receiveWebRTCOffer({
- type: 'answer'
- })).toBe(false);
- });
-
- it('accepts valid offers', function() {
- expect(pp.pc).not.toBeNull();
- expect(pp.receiveWebRTCOffer({
- type: 'offer',
- sdp: 'foo'
- })).toBe(true);
- });
-
- });
-
- it('responds with a WebRTC answer correctly', function() {
- spyOn(snowflake.broker, 'sendAnswer');
- pp.pc.onicecandidate({
- candidate: null
- });
- expect(snowflake.broker.sendAnswer).toHaveBeenCalled();
- });
-
- it('handles a new data channel correctly', function() {
- expect(pp.client).toBeNull();
- pp.pc.ondatachannel({
- channel: {}
- });
- expect(pp.client).not.toBeNull();
- expect(pp.client.onopen).not.toBeNull();
- expect(pp.client.onclose).not.toBeNull();
- expect(pp.client.onerror).not.toBeNull();
- expect(pp.client.onmessage).not.toBeNull();
- });
-
- it('connects to the relay once datachannel opens', function() {
- spyOn(pp, 'connectRelay');
- pp.active = true;
- pp.client.onopen();
- expect(pp.connectRelay).toHaveBeenCalled();
- });
-
- it('connects to a relay', function() {
- pp.connectRelay();
- expect(pp.relay.onopen).not.toBeNull();
- expect(pp.relay.onclose).not.toBeNull();
- expect(pp.relay.onerror).not.toBeNull();
- expect(pp.relay.onmessage).not.toBeNull();
- });
-
- describe('flushes data between client and relay', function() {
-
- it('proxies data from client to relay', function() {
- var msg;
- pp.pc.ondatachannel({
- channel: {
- bufferedAmount: 0,
- readyState: "open",
- send: function(data) {}
- }
- });
- spyOn(pp.client, 'send');
- spyOn(pp.relay, 'send');
- msg = new MessageEvent("message", {
- data: Uint8Array.from([1, 2, 3]).buffer
- });
- pp.onClientToRelayMessage(msg);
- pp.flush();
- expect(pp.client.send).not.toHaveBeenCalled();
- expect(pp.relay.send).toHaveBeenCalledWith(arrayMatching([1, 2, 3]));
- });
-
- it('proxies data from relay to client', function() {
- var msg;
- spyOn(pp.client, 'send');
- spyOn(pp.relay, 'send');
- msg = new MessageEvent("message", {
- data: Uint8Array.from([4, 5, 6]).buffer
- });
- pp.onRelayToClientMessage(msg);
- pp.flush();
- expect(pp.client.send).toHaveBeenCalledWith(arrayMatching([4, 5, 6]));
- expect(pp.relay.send).not.toHaveBeenCalled();
- });
-
- it('sends nothing with nothing to flush', function() {
- spyOn(pp.client, 'send');
- spyOn(pp.relay, 'send');
- pp.flush();
- expect(pp.client.send).not.toHaveBeenCalled();
- expect(pp.relay.send).not.toHaveBeenCalled();
- });
-
- });
-
-});
-
-// TODO: rate limit tests
diff --git a/proxy/spec/snowflake.spec.js b/proxy/spec/snowflake.spec.js
deleted file mode 100644
index 970947b..0000000
--- a/proxy/spec/snowflake.spec.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/* global expect, it, describe, spyOn, Snowflake, Config, UI */
-
-/*
-jasmine tests for Snowflake
-*/
-
-// Fake browser functionality:
-class PeerConnection {
- setRemoteDescription() {
- return true;
- }
- send() {}
-}
-
-class SessionDescription {}
-SessionDescription.prototype.type = 'offer';
-
-class WebSocket {
- constructor() {
- this.bufferedAmount = 0;
- }
- send() {}
-}
-WebSocket.prototype.OPEN = 1;
-WebSocket.prototype.CLOSED = 0;
-
-var log = function() {};
-
-var config = new Config();
-
-var ui = new UI();
-
-class FakeBroker {
- getClientOffer() {
- return new Promise(function() {
- return {};
- });
- }
-}
-
-describe('Snowflake', function() {
-
- it('constructs correctly', function() {
- var s;
- s = new Snowflake(config, ui, {
- fake: 'broker'
- });
- expect(s.rateLimit).not.toBeNull();
- expect(s.broker).toEqual({
- fake: 'broker'
- });
- expect(s.ui).not.toBeNull();
- expect(s.retries).toBe(0);
- });
-
- it('sets relay address correctly', function() {
- var s;
- s = new Snowflake(config, ui, null);
- s.setRelayAddr('foo');
- expect(s.relayAddr).toEqual('foo');
- });
-
- it('initalizes WebRTC connection', function() {
- var s;
- s = new Snowflake(config, ui, new FakeBroker());
- spyOn(s.broker, 'getClientOffer').and.callThrough();
- s.beginWebRTC();
- expect(s.retries).toBe(1);
- expect(s.broker.getClientOffer).toHaveBeenCalled();
- });
-
- it('receives SDP offer and sends answer', function() {
- var pair, s;
- s = new Snowflake(config, ui, new FakeBroker());
- pair = {
- receiveWebRTCOffer: function() {}
- };
- spyOn(pair, 'receiveWebRTCOffer').and.returnValue(true);
- spyOn(s, 'sendAnswer');
- s.receiveOffer(pair, '{"type":"offer","sdp":"foo"}');
- expect(s.sendAnswer).toHaveBeenCalled();
- });
-
- it('does not send answer when receiving invalid offer', function() {
- var pair, s;
- s = new Snowflake(config, ui, new FakeBroker());
- pair = {
- receiveWebRTCOffer: function() {}
- };
- spyOn(pair, 'receiveWebRTCOffer').and.returnValue(false);
- spyOn(s, 'sendAnswer');
- s.receiveOffer(pair, '{"type":"not a good offer","sdp":"foo"}');
- expect(s.sendAnswer).not.toHaveBeenCalled();
- });
-
- it('can make a proxypair', function() {
- var s;
- s = new Snowflake(config, ui, new FakeBroker());
- s.makeProxyPair();
- expect(s.proxyPairs.length).toBe(1);
- });
-
-});
diff --git a/proxy/spec/ui.spec.js b/proxy/spec/ui.spec.js
deleted file mode 100644
index dc9aa35..0000000
--- a/proxy/spec/ui.spec.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* global expect, it, describe, spyOn, DebugUI */
-/* eslint no-redeclare: 0 */
-
-/*
-jasmine tests for Snowflake UI
-*/
-
-var document = {
- getElementById: function() {
- return {};
- },
- createTextNode: function(txt) {
- return txt;
- }
-};
-
-describe('UI', function() {
-
- it('activates debug mode when badge does not exist', function() {
- var u;
- spyOn(document, 'getElementById').and.callFake(function(id) {
- if ('badge' === id) {
- return null;
- }
- return {};
- });
- u = new DebugUI();
- expect(document.getElementById.calls.count()).toEqual(2);
- expect(u.$status).not.toBeNull();
- expect(u.$msglog).not.toBeNull();
- });
-
- it('sets status message when in debug mode', function() {
- var u;
- u = new DebugUI();
- u.$status = {
- innerHTML: '',
- appendChild: function(txt) {
- return this.innerHTML = txt;
- }
- };
- u.setStatus('test');
- expect(u.$status.innerHTML).toEqual('Status: test');
- });
-
- it('sets message log css correctly for debug mode', function() {
- var u;
- u = new DebugUI();
- u.setActive(true);
- expect(u.$msglog.className).toEqual('active');
- u.setActive(false);
- expect(u.$msglog.className).toEqual('');
- });
-
- it('logs to the textarea correctly when debug mode', function() {
- var u;
- u = new DebugUI();
- u.$msglog = {
- value: '',
- scrollTop: 0,
- scrollHeight: 1337
- };
- u.log('test');
- expect(u.$msglog.value).toEqual('test\n');
- expect(u.$msglog.scrollTop).toEqual(1337);
- });
-
-});
diff --git a/proxy/spec/util.spec.js b/proxy/spec/util.spec.js
deleted file mode 100644
index 6eb5be4..0000000
--- a/proxy/spec/util.spec.js
+++ /dev/null
@@ -1,252 +0,0 @@
-/* global expect, it, describe, Parse, Params */
-
-/*
-jasmine tests for Snowflake utils
-*/
-
-describe('Parse', function() {
-
- describe('cookie', function() {
-
- it('parses correctly', function() {
- expect(Parse.cookie('')).toEqual({});
- expect(Parse.cookie('a=b')).toEqual({
- a: 'b'
- });
- expect(Parse.cookie('a=b=c')).toEqual({
- a: 'b=c'
- });
- expect(Parse.cookie('a=b; c=d')).toEqual({
- a: 'b',
- c: 'd'
- });
- expect(Parse.cookie('a=b ; c=d')).toEqual({
- a: 'b',
- c: 'd'
- });
- expect(Parse.cookie('a= b')).toEqual({
- a: 'b'
- });
- expect(Parse.cookie('a=')).toEqual({
- a: ''
- });
- expect(Parse.cookie('key')).toBeNull();
- expect(Parse.cookie('key=%26%20')).toEqual({
- key: '& '
- });
- expect(Parse.cookie('a=\'\'')).toEqual({
- a: '\'\''
- });
- });
-
- });
-
- describe('address', function() {
-
- it('parses IPv4', function() {
- expect(Parse.address('')).toBeNull();
- expect(Parse.address('3.3.3.3:4444')).toEqual({
- host: '3.3.3.3',
- port: 4444
- });
- expect(Parse.address('3.3.3.3')).toBeNull();
- expect(Parse.address('3.3.3.3:0x1111')).toBeNull();
- expect(Parse.address('3.3.3.3:-4444')).toBeNull();
- expect(Parse.address('3.3.3.3:65536')).toBeNull();
- });
-
- it('parses IPv6', function() {
- expect(Parse.address('[1:2::a:f]:4444')).toEqual({
- host: '1:2::a:f',
- port: 4444
- });
- expect(Parse.address('[1:2::a:f]')).toBeNull();
- expect(Parse.address('[1:2::a:f]:0x1111')).toBeNull();
- expect(Parse.address('[1:2::a:f]:-4444')).toBeNull();
- expect(Parse.address('[1:2::a:f]:65536')).toBeNull();
- expect(Parse.address('[1:2::ffff:1.2.3.4]:4444')).toEqual({
- host: '1:2::ffff:1.2.3.4',
- port: 4444
- });
- });
-
- });
-
- describe('byte count', function() {
-
- it('returns null for bad inputs', function() {
- expect(Parse.byteCount("")).toBeNull();
- expect(Parse.byteCount("x")).toBeNull();
- expect(Parse.byteCount("1x")).toBeNull();
- expect(Parse.byteCount("1.x")).toBeNull();
- expect(Parse.byteCount("1.2x")).toBeNull();
- expect(Parse.byteCount("toString")).toBeNull();
- expect(Parse.byteCount("1toString")).toBeNull();
- expect(Parse.byteCount("1.toString")).toBeNull();
- expect(Parse.byteCount("1.2toString")).toBeNull();
- expect(Parse.byteCount("k")).toBeNull();
- expect(Parse.byteCount("m")).toBeNull();
- expect(Parse.byteCount("g")).toBeNull();
- expect(Parse.byteCount("K")).toBeNull();
- expect(Parse.byteCount("M")).toBeNull();
- expect(Parse.byteCount("G")).toBeNull();
- expect(Parse.byteCount("-1")).toBeNull();
- expect(Parse.byteCount("-1k")).toBeNull();
- expect(Parse.byteCount("1.2.3")).toBeNull();
- expect(Parse.byteCount("1.2.3k")).toBeNull();
- });
-
- it('handles numbers without a suffix', function() {
- expect(Parse.byteCount("10")).toEqual(10);
- expect(Parse.byteCount("10.")).toEqual(10);
- expect(Parse.byteCount("1.5")).toEqual(1.5);
- });
-
- it('handles lowercase suffixes', function() {
- expect(Parse.byteCount("10k")).toEqual(10*1024);
- expect(Parse.byteCount("10m")).toEqual(10*1024*1024);
- expect(Parse.byteCount("10g")).toEqual(10*1024*1024*1024);
- expect(Parse.byteCount("10.k")).toEqual(10*1024);
- expect(Parse.byteCount("10.m")).toEqual(10*1024*1024);
- expect(Parse.byteCount("10.g")).toEqual(10*1024*1024*1024);
- expect(Parse.byteCount("1.5k")).toEqual(1.5*1024);
- expect(Parse.byteCount("1.5m")).toEqual(1.5*1024*1024);
- expect(Parse.byteCount("1.5G")).toEqual(1.5*1024*1024*1024);
- });
-
- it('handles uppercase suffixes', function() {
- expect(Parse.byteCount("10K")).toEqual(10*1024);
- expect(Parse.byteCount("10M")).toEqual(10*1024*1024);
- expect(Parse.byteCount("10G")).toEqual(10*1024*1024*1024);
- expect(Parse.byteCount("10.K")).toEqual(10*1024);
- expect(Parse.byteCount("10.M")).toEqual(10*1024*1024);
- expect(Parse.byteCount("10.G")).toEqual(10*1024*1024*1024);
- expect(Parse.byteCount("1.5K")).toEqual(1.5*1024);
- expect(Parse.byteCount("1.5M")).toEqual(1.5*1024*1024);
- expect(Parse.byteCount("1.5G")).toEqual(1.5*1024*1024*1024);
- });
-
- });
-
- describe('ipFromSDP', function() {
-
- var testCases = [
- {
- // https://tools.ietf.org/html/rfc4566#section-5
- sdp: "v=0\no=jdoe 2890844526 2890842807 IN IP4 10.47.16.5\ns=SDP Seminar\ni=A Seminar on the session description protocol\nu=http://www.example.com/seminars/sdp.pdf\ne=j.doe@example.com (Jane Doe)\nc=IN IP4 224.2.17.12/127\nt=2873397496 2873404696\na=recvonly\nm=audio 49170 RTP/AVP 0\nm=video 51372 RTP/AVP 99\na=rtpmap:99 h263-1998/90000",
- expected: '224.2.17.12'
- },
- {
- // Missing c= line
- sdp: "v=0\no=jdoe 2890844526 2890842807 IN IP4 10.47.16.5\ns=SDP Seminar\ni=A Seminar on the session description protocol\nu=http://www.example.com/seminars/sdp.pdf\ne=j.doe@example.com (Jane Doe)\nt=2873397496 2873404696\na=recvonly\nm=audio 49170 RTP/AVP 0\nm=video 51372 RTP/AVP 99\na=rtpmap:99 h263-1998/90000",
- expected: void 0
- },
- {
- // Single line, IP address only
- sdp: "c=IN IP4 224.2.1.1\n",
- expected: '224.2.1.1'
- },
- {
- // Same, with TTL
- sdp: "c=IN IP4 224.2.1.1/127\n",
- expected: '224.2.1.1'
- },
- {
- // Same, with TTL and multicast addresses
- sdp: "c=IN IP4 224.2.1.1/127/3\n",
- expected: '224.2.1.1'
- },
- {
- // IPv6, address only
- sdp: "c=IN IP6 FF15::101\n",
- expected: 'ff15::101'
- },
- {
- // Same, with multicast addresses
- sdp: "c=IN IP6 FF15::101/3\n",
- expected: 'ff15::101'
- },
- {
- // Multiple c= lines
- sdp: "c=IN IP4 1.2.3.4\nc=IN IP4 5.6.7.8",
- expected: '1.2.3.4'
- },
- {
- // Modified from SDP sent by snowflake-client.
- sdp: "v=0\no=- 7860378660295630295 2 IN IP4 127.0.0.1\ns=-\nt=0 0\na=group:BUNDLE data\na=msid-semantic: WMS\nm=application 54653 DTLS/SCTP 5000\nc=IN IP4 1.2.3.4\na=candidate:3581707038 1 udp 2122260223 192.168.0.1 54653 typ host generation 0 network-id 1 network-cost 50\na=candidate:2617212910 1 tcp 1518280447 192.168.0.1 59673 typ host tcptype passive generation 0 network-id 1 network-cost 50\na=candidate:2082671819 1 udp 1686052607 1.2.3.4 54653 typ srflx raddr 192.168.0.1 rport 54653 generation 0 network-id 1 network-cost 50\na=ice-ufrag:IBdf\na=ice-pwd:G3lTrrC9gmhQx481AowtkhYz\na=fingerprint:sha-256 53:F8:84:D9:3C:1F:A0:44:AA:D6:3C:65:80:D3:CB:6F:23:90:17:41:06:F9:9C:10:D8:48:4A:A8:B6:FA:14:A1\na=setup:actpass\na=mid:data\na=sctpmap:5000 webrtc-datachannel 1024",
- expected: '1.2.3.4'
- },
- {
- // Improper character within IPv4
- sdp: "c=IN IP4 224.2z.1.1",
- expected: void 0
- },
- {
- // Improper character within IPv6
- sdp: "c=IN IP6 ff15:g::101",
- expected: void 0
- },
- {
- // Bogus "IP7" addrtype
- sdp: "c=IN IP7 1.2.3.4\n",
- expected: void 0
- }
- ];
-
- it('parses SDP', function() {
- var i, len, ref, ref1, results, test;
- results = [];
- for (i = 0, len = testCases.length; i < len; i++) {
- test = testCases[i];
- // https://tools.ietf.org/html/rfc4566#section-5: "The sequence # CRLF
- // (0x0d0a) is used to end a record, although parsers SHOULD be tolerant
- // and also accept records terminated with a single newline character."
- // We represent the test cases with LF line endings for convenience, and
- // test them both that way and with CRLF line endings.
- expect((ref = Parse.ipFromSDP(test.sdp)) != null ? ref.toLowerCase() : void 0).toEqual(test.expected);
- results.push(expect((ref1 = Parse.ipFromSDP(test.sdp.replace(/\n/, "\r\n"))) != null ? ref1.toLowerCase() : void 0).toEqual(test.expected));
- }
- return results;
- });
-
- });
-
-});
-
-describe('Params', function() {
-
- describe('bool', function() {
-
- var getBool = function(query) {
- return Params.getBool(new URLSearchParams(query), 'param', false);
- };
-
- it('parses correctly', function() {
- expect(getBool('param=true')).toBe(true);
- expect(getBool('param')).toBe(true);
- expect(getBool('param=')).toBe(true);
- expect(getBool('param=1')).toBe(true);
- expect(getBool('param=0')).toBe(false);
- expect(getBool('param=false')).toBe(false);
- expect(getBool('param=unexpected')).toBeNull();
- expect(getBool('pram=true')).toBe(false);
- });
-
- });
-
- describe('byteCount', function() {
-
- var DEFAULT = 77;
- var getByteCount = function(query) {
- return Params.getByteCount(new URLSearchParams(query), 'param', DEFAULT);
- };
-
- it('supports default values', function() {
- expect(getByteCount('param=x')).toBeNull();
- expect(getByteCount('param=10')).toEqual(10);
- expect(getByteCount('foo=10k')).toEqual(DEFAULT);
- });
-
- });
-
-});
diff --git a/proxy/spec/websocket.spec.js b/proxy/spec/websocket.spec.js
deleted file mode 100644
index 6c2ef2e..0000000
--- a/proxy/spec/websocket.spec.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* global expect, it, describe, WS */
-
-/*
-jasmine tests for Snowflake websocket
-*/
-
-describe('BuildUrl', function() {
-
- it('should parse just protocol and host', function() {
- expect(WS.buildUrl('http', 'example.com')).toBe('http://example.com');
- });
-
- it('should handle different ports', function() {
- expect(WS.buildUrl('http', 'example.com', 80)).toBe('http://example.com');
- expect(WS.buildUrl('http', 'example.com', 81)).toBe('http://example.com:81');
- expect(WS.buildUrl('http', 'example.com', 443)).toBe('http://example.com:443');
- expect(WS.buildUrl('http', 'example.com', 444)).toBe('http://example.com:444');
- });
-
- it('should handle paths', function() {
- expect(WS.buildUrl('http', 'example.com', 80, '/')).toBe('http://example.com/');
- expect(WS.buildUrl('http', 'example.com', 80, '/test?k=%#v')).toBe('http://example.com/test%3Fk%3D%25%23v');
- expect(WS.buildUrl('http', 'example.com', 80, '/test')).toBe('http://example.com/test');
- });
-
- it('should handle params', function() {
- expect(WS.buildUrl('http', 'example.com', 80, '/test', [['k', '%#v']])).toBe('http://example.com/test?k=%25%23v');
- expect(WS.buildUrl('http', 'example.com', 80, '/test', [['a', 'b'], ['c', 'd']])).toBe('http://example.com/test?a=b&c=d');
- });
-
- it('should handle ips', function() {
- expect(WS.buildUrl('http', '1.2.3.4')).toBe('http://1.2.3.4');
- expect(WS.buildUrl('http', '1:2::3:4')).toBe('http://[1:2::3:4]');
- });
-
- it('should handle bogus', function() {
- expect(WS.buildUrl('http', 'bog][us')).toBe('http://bog%5D%5Bus');
- expect(WS.buildUrl('http', 'bog:u]s')).toBe('http://bog%3Au%5Ds');
- });
-
-});
diff --git a/proxy/static/.htaccess b/proxy/static/.htaccess
deleted file mode 100644
index 1a8277f..0000000
--- a/proxy/static/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-<Files "embed.html">
- Header always unset X-Frame-Options
-</Files>
-
-Redirect permanent /snowflake.html /
diff --git a/proxy/static/SourceSansPro-Regular.ttf b/proxy/static/SourceSansPro-Regular.ttf
deleted file mode 100644
index 278ad8a..0000000
Binary files a/proxy/static/SourceSansPro-Regular.ttf and /dev/null differ
diff --git a/proxy/static/_locales/en_US/messages.json b/proxy/static/_locales/en_US/messages.json
deleted file mode 100644
index 0d638c7..0000000
--- a/proxy/static/_locales/en_US/messages.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
- "appDesc": {
- "message": "Snowflake is a WebRTC pluggable transport for Tor."
- },
- "popupEnabled": {
- "message": "Enabled"
- },
- "popupLearnMore": {
- "message": "Learn more"
- },
- "popupStatusOff": {
- "message": "Snowflake is off"
- },
- "popupStatusOn": {
- "message": "Number of users currently connected: $1"
- },
- "popupStatusReady": {
- "message": "Your Snowflake is ready to help users circumvent censorship"
- },
- "popupWebRTCOff": {
- "message": "WebRTC feature is not detected."
- },
- "popupBridgeUnreachable": {
- "message": "Could not connect to the bridge."
- },
- "popupDescOn": {
- "message": "Number of users your Snowflake has helped circumvent censorship in the last 24 hours: $1"
- },
- "badgeCookiesOff": {
- "message": "Cookies are not enabled."
- },
- "websiteIntro": {
- "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">documentation wiki</a>."
- },
- "docWiki": {
- "message": "documentation wiki"
- },
- "browser": {
- "message": "Browser"
- },
- "censoredUsers": {
- "message": "If your internet access is censored, you should download <a href=\"https://www.torproject.org/download/\">Tor Browser</a>."
- },
- "extension": {
- "message": "Extension"
- },
- "installExtension": {
- "message": "If your internet access is <strong>not</strong> censored, you should consider installing the Snowflake extension to help users in censored networks. There is no need to worry about which websites people are accessing through your proxy. Their visible browsing IP address will match their Tor exit node, not yours."
- },
- "installFirefox": {
- "message": "Install in Firefox"
- },
- "installChrome": {
- "message": "Install in Chrome"
- },
- "reportingBugs": {
- "message": "Reporting Bugs"
- },
- "fileBug": {
- "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug. To do so, you will have to,"
- },
- "sharedAccount": {
- "message": "Either <a href=\"https://trac.torproject.org/projects/tor/register\">create an account</a> or <a href=\"https://trac.torproject.org/projects/tor/login\">log in</a> using the shared <b>cypherpunks</b> account with password <b>writecode</b>."
- },
- "bugTracker": {
- "message": "<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> using our bug tracker."
- },
- "descriptive": {
- "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug. Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em> to let us know how which part of the Snowflake system is experiencing problems."
- },
- "embed": {
- "message": "Embed"
- },
- "possible": {
- "message": "It is now possible to embed the Snowflake badge on any website:"
- },
- "looksLike": {
- "message": "Which looks like this:"
- }
-}
diff --git a/proxy/static/assets/arrowhead-right-12.svg b/proxy/static/assets/arrowhead-right-12.svg
deleted file mode 100644
index 3f7e664..0000000
--- a/proxy/static/assets/arrowhead-right-12.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><path fill="black" d="M9 6a1 1 0 0 0-.293-.707l-3-3a1 1 0 0 0-1.414 1.414L6.586 6 4.293 8.293a1 1 0 0 0 1.414 1.414l3-3A1 1 0 0 0 9 6z"/></svg>
\ No newline at end of file
diff --git a/proxy/static/assets/arrowhead-right-dark-12.svg b/proxy/static/assets/arrowhead-right-dark-12.svg
deleted file mode 100644
index 6534fd0..0000000
--- a/proxy/static/assets/arrowhead-right-dark-12.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><path fill="white" d="M9 6a1 1 0 0 0-.293-.707l-3-3a1 1 0 0 0-1.414 1.414L6.586 6 4.293 8.293a1 1 0 0 0 1.414 1.414l3-3A1 1 0 0 0 9 6z"/></svg>
\ No newline at end of file
diff --git a/proxy/static/assets/favicon.ico b/proxy/static/assets/favicon.ico
deleted file mode 100644
index 48060b1..0000000
Binary files a/proxy/static/assets/favicon.ico and /dev/null differ
diff --git a/proxy/static/assets/status-off-dark.svg b/proxy/static/assets/status-off-dark.svg
deleted file mode 100644
index 3df7cc3..0000000
--- a/proxy/static/assets/status-off-dark.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="61px" height="61px" viewBox="0 0 61 61" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
- <title>Fill-4</title>
- <desc>Created with Sketch.</desc>
- <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.4">
- <g id="status-off-dark" fill="#F9F9FA" fill-rule="nonzero">
- <path d="M51.7222976,29.9000395 C53.7806847,27.8629428 57.1855234,24.4890718 59.1755234,22.5000395 C59.5535879,22.121975 59.5535879,21.5090718 59.175846,21.1310073 C58.7977815,20.7532653 58.1855234,20.7535879 57.8071363,21.1306847 C55.2393944,23.6977815 50.3032653,28.5822976 48.9706847,29.9000395 L33.2039105,29.9000395 L43.9887492,19.1152008 C44.5145557,19.1216524 45.0410073,19.1252008 45.5674589,19.1252008 C46.8642331,19.1252008 48.1584266,19.1090718 49.421975,19.0929428 C51.8429428,19.0626202 54.3471363,19.0316524 56.8461686,19.1139105 C57.3874589,19.1271363 57.8277815,18.7132653 57.845846,18.1790718 C57.8635879,17.6448782 57.4448782,17.1974589 56.9103621,17.1797169 C54.3668137,17.0952008 51.8410073,17.1268137 49.3974589,17.1577815 C48.2548782,17.171975 47.0874589,17.1822976 45.9187492,17.1852008 L52.0810073,11.0229428 C52.4590718,10.6455234 52.4590718,10.0322976 52.0810073,9.65455566 C51.7032653,9.27649114 51.0900395,9.27649114 50.7126202,9.65455566 L44.8761686,15.491
0073 C44.8910073,12.575846 44.9116524,7.95262017 44.9122976,5.21326533 C44.9126202,4.67874921 44.4790718,4.2455234 43.9448782,4.24520082 C43.4103621,4.24520082 42.9771363,4.67842662 42.9768137,5.21294275 C42.9761686,8.71100727 42.9422976,15.2839105 42.9306847,17.4364911 L31.8355234,28.5316524 L31.8355234,13.0864911 C32.9977815,11.9116524 38.0655234,6.78907179 40.6977815,4.15584598 C41.075846,3.77778146 41.075846,3.16520082 40.6977815,2.78745888 C40.3193944,2.40907179 39.7064911,2.40971695 39.3287492,2.78745888 C37.3090718,4.80810404 33.8616524,8.28778146 31.8355234,10.3345557 L31.8355234,1.8355234 C31.8355234,1.30100727 31.4022976,0.867781463 30.8677815,0.867781463 C30.3335879,0.867781463 29.9000395,1.30100727 29.9000395,1.8355234 L29.9000395,10.2890718 C29.1613299,9.5439105 28.428104,8.7971363 27.711975,8.06262017 C26.005846,6.31294275 24.2416524,4.5039105 22.3832653,2.76520082 C21.9932653,2.40003953 21.3810073,2.41971695 21.0155234,2.81036211 C20.6503621,3.20068469 20.6706847,3.81
294275 21.0610073,4.17842662 C22.8868137,5.8871363 24.6352008,7.67971695 26.3261686,9.41358791 C27.4861686,10.6029428 28.6845557,11.8264911 29.9000395,13.0197169 L29.9000395,28.5316524 L19.3787492,18.0103621 C19.3735879,17.0690718 19.3293944,9.14487824 19.3290718,5.1771363 C19.3287492,4.64294275 18.895846,4.20939437 18.3610073,4.20971695 C17.8268137,4.20971695 17.3932653,4.64326533 17.3935879,5.17745888 C17.3939105,8.1171363 17.4184266,13.2245557 17.4329428,16.0642331 L11.0229428,9.65455566 C10.6455234,9.27649114 10.0322976,9.27649114 9.65455566,9.65455566 C9.27649114,10.0322976 9.27649114,10.6455234 9.65455566,11.0229428 L15.7800395,17.1484266 C14.8148782,17.1432653 13.8529428,17.1342331 12.9084266,17.1222976 C10.4648782,17.0913299 7.93874921,17.0593944 5.3955234,17.1442331 C4.86132985,17.161975 4.44262017,17.6090718 4.46036211,18.1435879 C4.47810404,18.6777815 4.92262017,19.0968137 5.45971695,19.0784266 C7.95842662,18.995846 10.4626202,19.0271363 12.8842331,19.0574589 C14.1477815,
19.0732653 15.4416524,19.0893944 16.7384266,19.0893944 C17.0639105,19.0893944 17.3893944,19.085846 17.7152008,19.0835879 L28.5316524,29.9000395 L13.2916524,29.9000395 C11.9590718,28.5822976 7.02294275,23.6977815 4.45520082,21.1306847 C4.0771363,20.7535879 3.46455566,20.7532653 3.08681372,21.1310073 C2.70874921,21.5090718 2.70874921,22.121975 3.08681372,22.5000395 C5.07681372,24.4890718 8.48165243,27.8629428 10.5397169,29.9000395 L1.8355234,29.9000395 C1.30132985,29.9000395 0.867781463,30.3332653 0.867781463,30.8677815 C0.867781463,31.4022976 1.30132985,31.8355234 1.8355234,31.8355234 L10.6816524,31.8355234 C9.9055234,32.6064911 9.12616856,33.3713299 8.36003953,34.1184266 C6.61132985,35.8239105 4.80262017,37.5877815 3.06455566,39.4452008 C2.69939437,39.8355234 2.71939437,40.4477815 3.10971695,40.8129428 C3.29649114,40.9874589 3.5339105,41.0742331 3.77100727,41.0742331 C4.02939437,41.0742331 4.2871363,40.9710073 4.47745888,40.7674589 C6.1855234,38.9422976 7.97810404,37.1945557 9.71132
985,35.5042331 C10.9316524,34.3142331 12.1887492,33.0839105 13.4116524,31.8355234 L28.5316524,31.8355234 L17.2216524,43.1455234 C15.5610073,43.1322976 13.8929428,43.1506847 12.2739105,43.1716524 C9.85262017,43.2013299 7.34842662,43.2326202 4.84971695,43.1503621 C4.31520082,43.1377815 3.86810404,43.5510073 3.85003953,44.0855234 C3.83229759,44.6197169 4.25100727,45.0671363 4.7855234,45.0845557 C7.32842662,45.1690718 9.85455566,45.1371363 12.2984266,45.1068137 C13.2806847,45.0945557 14.2822976,45.0852008 15.2864911,45.0806847 L9.65455566,50.7126202 C9.27649114,51.0900395 9.27649114,51.7032653 9.65455566,52.0810073 C9.84358791,52.2700395 10.0913299,52.3645557 10.3387492,52.3645557 C10.5864911,52.3645557 10.8342331,52.2700395 11.0229428,52.0810073 L16.821975,46.281975 C16.8074589,49.1426202 16.7839105,54.1516524 16.7835879,57.0513299 C16.7832653,57.585846 17.2168137,58.0193944 17.7510073,58.0193944 C18.2855234,58.0193944 18.7187492,57.5861686 18.7190718,57.051975 C18.7197169,53.2174589 1
8.7606847,45.6877815 18.7677815,44.3361686 L29.9000395,33.2039105 L29.9000395,48.715846 C28.6839105,49.9100395 27.4848782,51.1339105 26.3242331,52.3239105 C24.6339105,54.0571363 22.8861686,55.8490718 21.0610073,57.5571363 C20.6706847,57.9222976 20.6503621,58.5348782 21.0155234,58.9252008 C21.2061686,59.1284266 21.4639105,59.2316524 21.7222976,59.2316524 C21.9593944,59.2316524 22.1968137,59.1448782 22.3832653,58.9703621 C24.2410073,57.231975 26.0045557,55.4239105 27.7100395,53.6752008 C28.4271363,52.9400395 29.1610073,52.1922976 29.9000395,51.4468137 L29.9000395,59.9000395 C29.9000395,60.4345557 30.3335879,60.8677815 30.8677815,60.8677815 C31.4022976,60.8677815 31.8355234,60.4345557 31.8355234,59.9000395 L31.8355234,51.4010073 C33.8616524,53.448104 37.3090718,56.9271363 39.3287492,58.948104 C39.7068137,59.325846 40.3193944,59.3261686 40.6977815,58.9484266 C41.075846,58.5703621 41.075846,57.9577815 40.6977815,57.5797169 C38.0655234,54.9468137 32.9977815,49.8242331 31.8355234,48.649394
4 L31.8355234,33.2039105 L42.735846,44.1042331 C42.7442331,45.6068137 42.7839105,52.9790718 42.7845557,56.7587492 C42.7848782,57.2932653 43.218104,57.7264911 43.7526202,57.7264911 C44.2871363,57.7264911 44.7203621,57.2929428 44.7200395,56.7587492 C44.7197169,53.8793944 44.6964911,48.9210073 44.681975,46.0500395 L50.7126202,52.0810073 C50.9013299,52.2700395 51.1490718,52.3645557 51.3968137,52.3645557 C51.6442331,52.3645557 51.8922976,52.2700395 52.0810073,52.0810073 C52.4590718,51.7032653 52.4590718,51.0900395 52.0810073,50.7126202 L46.1561686,44.7874589 C47.1806847,44.7922976 48.2029428,44.8013299 49.2055234,44.8139105 C51.6487492,44.8448782 54.1745557,44.8768137 56.7184266,44.791975 C57.2526202,44.7742331 57.6713299,44.3271363 57.6535879,43.7926202 C57.6355234,43.2584266 57.1955234,42.8461686 56.6539105,42.8577815 C54.1548782,42.9400395 51.6510073,42.9087492 49.2297169,42.8787492 C47.5913299,42.858104 45.9026202,42.8390718 44.2216524,42.8532653 L33.2039105,31.8355234 L48.8506847,31
.8355234 C50.0735879,33.0839105 51.3310073,34.3142331 52.5510073,35.5042331 C54.2845557,37.1945557 56.0764911,38.9422976 57.7845557,40.7674589 C57.9752008,40.9710073 58.2329428,41.0742331 58.4916524,41.0742331 C58.7284266,41.0742331 58.965846,40.9874589 59.1526202,40.8129428 C59.5429428,40.4477815 59.5632653,39.8355234 59.1977815,39.4452008 C57.4597169,37.5877815 55.6513299,35.8239105 53.9022976,34.1184266 C53.1361686,33.3713299 52.3568137,32.6064911 51.5806847,31.8355234 L59.9000395,31.8355234 C60.4345557,31.8355234 60.8677815,31.4022976 60.8677815,30.8677815 C60.8677815,30.3332653 60.4345557,29.9000395 59.9000395,29.9000395 L51.7222976,29.9000395 Z" id="Fill-4"></path>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/proxy/static/assets/status-off.svg b/proxy/static/assets/status-off.svg
deleted file mode 100644
index 843b278..0000000
--- a/proxy/static/assets/status-off.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>status-off</title>
- <g id="Snowflake-Extension" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <path d="M51.7222976,29.9000395 C53.7806847,27.8629428 57.1855234,24.4890718 59.1755234,22.5000395 C59.5535879,22.121975 59.5535879,21.5090718 59.175846,21.1310073 C58.7977815,20.7532653 58.1855234,20.7535879 57.8071363,21.1306847 C55.2393944,23.6977815 50.3032653,28.5822976 48.9706847,29.9000395 L33.2039105,29.9000395 L43.9887492,19.1152008 C44.5145557,19.1216524 45.0410073,19.1252008 45.5674589,19.1252008 C46.8642331,19.1252008 48.1584266,19.1090718 49.421975,19.0929428 C51.8429428,19.0626202 54.3471363,19.0316524 56.8461686,19.1139105 C57.3874589,19.1271363 57.8277815,18.7132653 57.845846,18.1790718 C57.8635879,17.6448782 57.4448782,17.1974589 56.9103621,17.1797169 C54.3668137,17.0952008 51.8410073,17.1268137 49.3974589,17.1577815 C48.2548782,17.171975 47.0874589,17.1822976 45.9187492,17.1852008 L52.0810073,11.0229428 C52.4590718,10.6455234 52.4590718,10.0322976 52.0810073,9.65455566 C51.7032653,9.27649114 51.0900395,9.27649114 50.7126202,9.65455566 L44.8761686,15.4910073
C44.8910073,12.575846 44.9116524,7.95262017 44.9122976,5.21326533 C44.9126202,4.67874921 44.4790718,4.2455234 43.9448782,4.24520082 C43.4103621,4.24520082 42.9771363,4.67842662 42.9768137,5.21294275 C42.9761686,8.71100727 42.9422976,15.2839105 42.9306847,17.4364911 L31.8355234,28.5316524 L31.8355234,13.0864911 C32.9977815,11.9116524 38.0655234,6.78907179 40.6977815,4.15584598 C41.075846,3.77778146 41.075846,3.16520082 40.6977815,2.78745888 C40.3193944,2.40907179 39.7064911,2.40971695 39.3287492,2.78745888 C37.3090718,4.80810404 33.8616524,8.28778146 31.8355234,10.3345557 L31.8355234,1.8355234 C31.8355234,1.30100727 31.4022976,0.867781463 30.8677815,0.867781463 C30.3335879,0.867781463 29.9000395,1.30100727 29.9000395,1.8355234 L29.9000395,10.2890718 C29.1613299,9.5439105 28.428104,8.7971363 27.711975,8.06262017 C26.005846,6.31294275 24.2416524,4.5039105 22.3832653,2.76520082 C21.9932653,2.40003953 21.3810073,2.41971695 21.0155234,2.81036211 C20.6503621,3.20068469 20.6706847,3.812942
75 21.0610073,4.17842662 C22.8868137,5.8871363 24.6352008,7.67971695 26.3261686,9.41358791 C27.4861686,10.6029428 28.6845557,11.8264911 29.9000395,13.0197169 L29.9000395,28.5316524 L19.3787492,18.0103621 C19.3735879,17.0690718 19.3293944,9.14487824 19.3290718,5.1771363 C19.3287492,4.64294275 18.895846,4.20939437 18.3610073,4.20971695 C17.8268137,4.20971695 17.3932653,4.64326533 17.3935879,5.17745888 C17.3939105,8.1171363 17.4184266,13.2245557 17.4329428,16.0642331 L11.0229428,9.65455566 C10.6455234,9.27649114 10.0322976,9.27649114 9.65455566,9.65455566 C9.27649114,10.0322976 9.27649114,10.6455234 9.65455566,11.0229428 L15.7800395,17.1484266 C14.8148782,17.1432653 13.8529428,17.1342331 12.9084266,17.1222976 C10.4648782,17.0913299 7.93874921,17.0593944 5.3955234,17.1442331 C4.86132985,17.161975 4.44262017,17.6090718 4.46036211,18.1435879 C4.47810404,18.6777815 4.92262017,19.0968137 5.45971695,19.0784266 C7.95842662,18.995846 10.4626202,19.0271363 12.8842331,19.0574589 C14.1477815,19.0
732653 15.4416524,19.0893944 16.7384266,19.0893944 C17.0639105,19.0893944 17.3893944,19.085846 17.7152008,19.0835879 L28.5316524,29.9000395 L13.2916524,29.9000395 C11.9590718,28.5822976 7.02294275,23.6977815 4.45520082,21.1306847 C4.0771363,20.7535879 3.46455566,20.7532653 3.08681372,21.1310073 C2.70874921,21.5090718 2.70874921,22.121975 3.08681372,22.5000395 C5.07681372,24.4890718 8.48165243,27.8629428 10.5397169,29.9000395 L1.8355234,29.9000395 C1.30132985,29.9000395 0.867781463,30.3332653 0.867781463,30.8677815 C0.867781463,31.4022976 1.30132985,31.8355234 1.8355234,31.8355234 L10.6816524,31.8355234 C9.9055234,32.6064911 9.12616856,33.3713299 8.36003953,34.1184266 C6.61132985,35.8239105 4.80262017,37.5877815 3.06455566,39.4452008 C2.69939437,39.8355234 2.71939437,40.4477815 3.10971695,40.8129428 C3.29649114,40.9874589 3.5339105,41.0742331 3.77100727,41.0742331 C4.02939437,41.0742331 4.2871363,40.9710073 4.47745888,40.7674589 C6.1855234,38.9422976 7.97810404,37.1945557 9.71132985,
35.5042331 C10.9316524,34.3142331 12.1887492,33.0839105 13.4116524,31.8355234 L28.5316524,31.8355234 L17.2216524,43.1455234 C15.5610073,43.1322976 13.8929428,43.1506847 12.2739105,43.1716524 C9.85262017,43.2013299 7.34842662,43.2326202 4.84971695,43.1503621 C4.31520082,43.1377815 3.86810404,43.5510073 3.85003953,44.0855234 C3.83229759,44.6197169 4.25100727,45.0671363 4.7855234,45.0845557 C7.32842662,45.1690718 9.85455566,45.1371363 12.2984266,45.1068137 C13.2806847,45.0945557 14.2822976,45.0852008 15.2864911,45.0806847 L9.65455566,50.7126202 C9.27649114,51.0900395 9.27649114,51.7032653 9.65455566,52.0810073 C9.84358791,52.2700395 10.0913299,52.3645557 10.3387492,52.3645557 C10.5864911,52.3645557 10.8342331,52.2700395 11.0229428,52.0810073 L16.821975,46.281975 C16.8074589,49.1426202 16.7839105,54.1516524 16.7835879,57.0513299 C16.7832653,57.585846 17.2168137,58.0193944 17.7510073,58.0193944 C18.2855234,58.0193944 18.7187492,57.5861686 18.7190718,57.051975 C18.7197169,53.2174589 18.76
06847,45.6877815 18.7677815,44.3361686 L29.9000395,33.2039105 L29.9000395,48.715846 C28.6839105,49.9100395 27.4848782,51.1339105 26.3242331,52.3239105 C24.6339105,54.0571363 22.8861686,55.8490718 21.0610073,57.5571363 C20.6706847,57.9222976 20.6503621,58.5348782 21.0155234,58.9252008 C21.2061686,59.1284266 21.4639105,59.2316524 21.7222976,59.2316524 C21.9593944,59.2316524 22.1968137,59.1448782 22.3832653,58.9703621 C24.2410073,57.231975 26.0045557,55.4239105 27.7100395,53.6752008 C28.4271363,52.9400395 29.1610073,52.1922976 29.9000395,51.4468137 L29.9000395,59.9000395 C29.9000395,60.4345557 30.3335879,60.8677815 30.8677815,60.8677815 C31.4022976,60.8677815 31.8355234,60.4345557 31.8355234,59.9000395 L31.8355234,51.4010073 C33.8616524,53.448104 37.3090718,56.9271363 39.3287492,58.948104 C39.7068137,59.325846 40.3193944,59.3261686 40.6977815,58.9484266 C41.075846,58.5703621 41.075846,57.9577815 40.6977815,57.5797169 C38.0655234,54.9468137 32.9977815,49.8242331 31.8355234,48.6493944 L3
1.8355234,33.2039105 L42.735846,44.1042331 C42.7442331,45.6068137 42.7839105,52.9790718 42.7845557,56.7587492 C42.7848782,57.2932653 43.218104,57.7264911 43.7526202,57.7264911 C44.2871363,57.7264911 44.7203621,57.2929428 44.7200395,56.7587492 C44.7197169,53.8793944 44.6964911,48.9210073 44.681975,46.0500395 L50.7126202,52.0810073 C50.9013299,52.2700395 51.1490718,52.3645557 51.3968137,52.3645557 C51.6442331,52.3645557 51.8922976,52.2700395 52.0810073,52.0810073 C52.4590718,51.7032653 52.4590718,51.0900395 52.0810073,50.7126202 L46.1561686,44.7874589 C47.1806847,44.7922976 48.2029428,44.8013299 49.2055234,44.8139105 C51.6487492,44.8448782 54.1745557,44.8768137 56.7184266,44.791975 C57.2526202,44.7742331 57.6713299,44.3271363 57.6535879,43.7926202 C57.6355234,43.2584266 57.1955234,42.8461686 56.6539105,42.8577815 C54.1548782,42.9400395 51.6510073,42.9087492 49.2297169,42.8787492 C47.5913299,42.858104 45.9026202,42.8390718 44.2216524,42.8532653 L33.2039105,31.8355234 L48.8506847,31.835
5234 C50.0735879,33.0839105 51.3310073,34.3142331 52.5510073,35.5042331 C54.2845557,37.1945557 56.0764911,38.9422976 57.7845557,40.7674589 C57.9752008,40.9710073 58.2329428,41.0742331 58.4916524,41.0742331 C58.7284266,41.0742331 58.965846,40.9874589 59.1526202,40.8129428 C59.5429428,40.4477815 59.5632653,39.8355234 59.1977815,39.4452008 C57.4597169,37.5877815 55.6513299,35.8239105 53.9022976,34.1184266 C53.1361686,33.3713299 52.3568137,32.6064911 51.5806847,31.8355234 L59.9000395,31.8355234 C60.4345557,31.8355234 60.8677815,31.4022976 60.8677815,30.8677815 C60.8677815,30.3332653 60.4345557,29.9000395 59.9000395,29.9000395 L51.7222976,29.9000395 Z" id="Fill-4" fill="#4A4A4F"></path>
- </g>
-</svg>
\ No newline at end of file
diff --git a/proxy/static/assets/status-on-dark.svg b/proxy/static/assets/status-on-dark.svg
deleted file mode 100644
index bfc9894..0000000
--- a/proxy/static/assets/status-on-dark.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="61px" height="61px" viewBox="0 0 61 61" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
- <title>Fill-4</title>
- <desc>Created with Sketch.</desc>
- <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <g id="status-on-dark" fill="#CC80FF" fill-rule="nonzero">
- <path d="M51.7222976,29.9000395 C53.7806847,27.8629428 57.1855234,24.4890718 59.1755234,22.5000395 C59.5535879,22.121975 59.5535879,21.5090718 59.175846,21.1310073 C58.7977815,20.7532653 58.1855234,20.7535879 57.8071363,21.1306847 C55.2393944,23.6977815 50.3032653,28.5822976 48.9706847,29.9000395 L33.2039105,29.9000395 L43.9887492,19.1152008 C44.5145557,19.1216524 45.0410073,19.1252008 45.5674589,19.1252008 C46.8642331,19.1252008 48.1584266,19.1090718 49.421975,19.0929428 C51.8429428,19.0626202 54.3471363,19.0316524 56.8461686,19.1139105 C57.3874589,19.1271363 57.8277815,18.7132653 57.845846,18.1790718 C57.8635879,17.6448782 57.4448782,17.1974589 56.9103621,17.1797169 C54.3668137,17.0952008 51.8410073,17.1268137 49.3974589,17.1577815 C48.2548782,17.171975 47.0874589,17.1822976 45.9187492,17.1852008 L52.0810073,11.0229428 C52.4590718,10.6455234 52.4590718,10.0322976 52.0810073,9.65455566 C51.7032653,9.27649114 51.0900395,9.27649114 50.7126202,9.65455566 L44.8761686,15.491
0073 C44.8910073,12.575846 44.9116524,7.95262017 44.9122976,5.21326533 C44.9126202,4.67874921 44.4790718,4.2455234 43.9448782,4.24520082 C43.4103621,4.24520082 42.9771363,4.67842662 42.9768137,5.21294275 C42.9761686,8.71100727 42.9422976,15.2839105 42.9306847,17.4364911 L31.8355234,28.5316524 L31.8355234,13.0864911 C32.9977815,11.9116524 38.0655234,6.78907179 40.6977815,4.15584598 C41.075846,3.77778146 41.075846,3.16520082 40.6977815,2.78745888 C40.3193944,2.40907179 39.7064911,2.40971695 39.3287492,2.78745888 C37.3090718,4.80810404 33.8616524,8.28778146 31.8355234,10.3345557 L31.8355234,1.8355234 C31.8355234,1.30100727 31.4022976,0.867781463 30.8677815,0.867781463 C30.3335879,0.867781463 29.9000395,1.30100727 29.9000395,1.8355234 L29.9000395,10.2890718 C29.1613299,9.5439105 28.428104,8.7971363 27.711975,8.06262017 C26.005846,6.31294275 24.2416524,4.5039105 22.3832653,2.76520082 C21.9932653,2.40003953 21.3810073,2.41971695 21.0155234,2.81036211 C20.6503621,3.20068469 20.6706847,3.81
294275 21.0610073,4.17842662 C22.8868137,5.8871363 24.6352008,7.67971695 26.3261686,9.41358791 C27.4861686,10.6029428 28.6845557,11.8264911 29.9000395,13.0197169 L29.9000395,28.5316524 L19.3787492,18.0103621 C19.3735879,17.0690718 19.3293944,9.14487824 19.3290718,5.1771363 C19.3287492,4.64294275 18.895846,4.20939437 18.3610073,4.20971695 C17.8268137,4.20971695 17.3932653,4.64326533 17.3935879,5.17745888 C17.3939105,8.1171363 17.4184266,13.2245557 17.4329428,16.0642331 L11.0229428,9.65455566 C10.6455234,9.27649114 10.0322976,9.27649114 9.65455566,9.65455566 C9.27649114,10.0322976 9.27649114,10.6455234 9.65455566,11.0229428 L15.7800395,17.1484266 C14.8148782,17.1432653 13.8529428,17.1342331 12.9084266,17.1222976 C10.4648782,17.0913299 7.93874921,17.0593944 5.3955234,17.1442331 C4.86132985,17.161975 4.44262017,17.6090718 4.46036211,18.1435879 C4.47810404,18.6777815 4.92262017,19.0968137 5.45971695,19.0784266 C7.95842662,18.995846 10.4626202,19.0271363 12.8842331,19.0574589 C14.1477815,
19.0732653 15.4416524,19.0893944 16.7384266,19.0893944 C17.0639105,19.0893944 17.3893944,19.085846 17.7152008,19.0835879 L28.5316524,29.9000395 L13.2916524,29.9000395 C11.9590718,28.5822976 7.02294275,23.6977815 4.45520082,21.1306847 C4.0771363,20.7535879 3.46455566,20.7532653 3.08681372,21.1310073 C2.70874921,21.5090718 2.70874921,22.121975 3.08681372,22.5000395 C5.07681372,24.4890718 8.48165243,27.8629428 10.5397169,29.9000395 L1.8355234,29.9000395 C1.30132985,29.9000395 0.867781463,30.3332653 0.867781463,30.8677815 C0.867781463,31.4022976 1.30132985,31.8355234 1.8355234,31.8355234 L10.6816524,31.8355234 C9.9055234,32.6064911 9.12616856,33.3713299 8.36003953,34.1184266 C6.61132985,35.8239105 4.80262017,37.5877815 3.06455566,39.4452008 C2.69939437,39.8355234 2.71939437,40.4477815 3.10971695,40.8129428 C3.29649114,40.9874589 3.5339105,41.0742331 3.77100727,41.0742331 C4.02939437,41.0742331 4.2871363,40.9710073 4.47745888,40.7674589 C6.1855234,38.9422976 7.97810404,37.1945557 9.71132
985,35.5042331 C10.9316524,34.3142331 12.1887492,33.0839105 13.4116524,31.8355234 L28.5316524,31.8355234 L17.2216524,43.1455234 C15.5610073,43.1322976 13.8929428,43.1506847 12.2739105,43.1716524 C9.85262017,43.2013299 7.34842662,43.2326202 4.84971695,43.1503621 C4.31520082,43.1377815 3.86810404,43.5510073 3.85003953,44.0855234 C3.83229759,44.6197169 4.25100727,45.0671363 4.7855234,45.0845557 C7.32842662,45.1690718 9.85455566,45.1371363 12.2984266,45.1068137 C13.2806847,45.0945557 14.2822976,45.0852008 15.2864911,45.0806847 L9.65455566,50.7126202 C9.27649114,51.0900395 9.27649114,51.7032653 9.65455566,52.0810073 C9.84358791,52.2700395 10.0913299,52.3645557 10.3387492,52.3645557 C10.5864911,52.3645557 10.8342331,52.2700395 11.0229428,52.0810073 L16.821975,46.281975 C16.8074589,49.1426202 16.7839105,54.1516524 16.7835879,57.0513299 C16.7832653,57.585846 17.2168137,58.0193944 17.7510073,58.0193944 C18.2855234,58.0193944 18.7187492,57.5861686 18.7190718,57.051975 C18.7197169,53.2174589 1
8.7606847,45.6877815 18.7677815,44.3361686 L29.9000395,33.2039105 L29.9000395,48.715846 C28.6839105,49.9100395 27.4848782,51.1339105 26.3242331,52.3239105 C24.6339105,54.0571363 22.8861686,55.8490718 21.0610073,57.5571363 C20.6706847,57.9222976 20.6503621,58.5348782 21.0155234,58.9252008 C21.2061686,59.1284266 21.4639105,59.2316524 21.7222976,59.2316524 C21.9593944,59.2316524 22.1968137,59.1448782 22.3832653,58.9703621 C24.2410073,57.231975 26.0045557,55.4239105 27.7100395,53.6752008 C28.4271363,52.9400395 29.1610073,52.1922976 29.9000395,51.4468137 L29.9000395,59.9000395 C29.9000395,60.4345557 30.3335879,60.8677815 30.8677815,60.8677815 C31.4022976,60.8677815 31.8355234,60.4345557 31.8355234,59.9000395 L31.8355234,51.4010073 C33.8616524,53.448104 37.3090718,56.9271363 39.3287492,58.948104 C39.7068137,59.325846 40.3193944,59.3261686 40.6977815,58.9484266 C41.075846,58.5703621 41.075846,57.9577815 40.6977815,57.5797169 C38.0655234,54.9468137 32.9977815,49.8242331 31.8355234,48.649394
4 L31.8355234,33.2039105 L42.735846,44.1042331 C42.7442331,45.6068137 42.7839105,52.9790718 42.7845557,56.7587492 C42.7848782,57.2932653 43.218104,57.7264911 43.7526202,57.7264911 C44.2871363,57.7264911 44.7203621,57.2929428 44.7200395,56.7587492 C44.7197169,53.8793944 44.6964911,48.9210073 44.681975,46.0500395 L50.7126202,52.0810073 C50.9013299,52.2700395 51.1490718,52.3645557 51.3968137,52.3645557 C51.6442331,52.3645557 51.8922976,52.2700395 52.0810073,52.0810073 C52.4590718,51.7032653 52.4590718,51.0900395 52.0810073,50.7126202 L46.1561686,44.7874589 C47.1806847,44.7922976 48.2029428,44.8013299 49.2055234,44.8139105 C51.6487492,44.8448782 54.1745557,44.8768137 56.7184266,44.791975 C57.2526202,44.7742331 57.6713299,44.3271363 57.6535879,43.7926202 C57.6355234,43.2584266 57.1955234,42.8461686 56.6539105,42.8577815 C54.1548782,42.9400395 51.6510073,42.9087492 49.2297169,42.8787492 C47.5913299,42.858104 45.9026202,42.8390718 44.2216524,42.8532653 L33.2039105,31.8355234 L48.8506847,31
.8355234 C50.0735879,33.0839105 51.3310073,34.3142331 52.5510073,35.5042331 C54.2845557,37.1945557 56.0764911,38.9422976 57.7845557,40.7674589 C57.9752008,40.9710073 58.2329428,41.0742331 58.4916524,41.0742331 C58.7284266,41.0742331 58.965846,40.9874589 59.1526202,40.8129428 C59.5429428,40.4477815 59.5632653,39.8355234 59.1977815,39.4452008 C57.4597169,37.5877815 55.6513299,35.8239105 53.9022976,34.1184266 C53.1361686,33.3713299 52.3568137,32.6064911 51.5806847,31.8355234 L59.9000395,31.8355234 C60.4345557,31.8355234 60.8677815,31.4022976 60.8677815,30.8677815 C60.8677815,30.3332653 60.4345557,29.9000395 59.9000395,29.9000395 L51.7222976,29.9000395 Z" id="Fill-4"></path>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/proxy/static/assets/status-on.svg b/proxy/static/assets/status-on.svg
deleted file mode 100644
index 4cd2be8..0000000
--- a/proxy/static/assets/status-on.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>status-on</title>
- <g id="Snowflake-Extension" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <path d="M51.7222976,29.9000395 C53.7806847,27.8629428 57.1855234,24.4890718 59.1755234,22.5000395 C59.5535879,22.121975 59.5535879,21.5090718 59.175846,21.1310073 C58.7977815,20.7532653 58.1855234,20.7535879 57.8071363,21.1306847 C55.2393944,23.6977815 50.3032653,28.5822976 48.9706847,29.9000395 L33.2039105,29.9000395 L43.9887492,19.1152008 C44.5145557,19.1216524 45.0410073,19.1252008 45.5674589,19.1252008 C46.8642331,19.1252008 48.1584266,19.1090718 49.421975,19.0929428 C51.8429428,19.0626202 54.3471363,19.0316524 56.8461686,19.1139105 C57.3874589,19.1271363 57.8277815,18.7132653 57.845846,18.1790718 C57.8635879,17.6448782 57.4448782,17.1974589 56.9103621,17.1797169 C54.3668137,17.0952008 51.8410073,17.1268137 49.3974589,17.1577815 C48.2548782,17.171975 47.0874589,17.1822976 45.9187492,17.1852008 L52.0810073,11.0229428 C52.4590718,10.6455234 52.4590718,10.0322976 52.0810073,9.65455566 C51.7032653,9.27649114 51.0900395,9.27649114 50.7126202,9.65455566 L44.8761686,15.4910073
C44.8910073,12.575846 44.9116524,7.95262017 44.9122976,5.21326533 C44.9126202,4.67874921 44.4790718,4.2455234 43.9448782,4.24520082 C43.4103621,4.24520082 42.9771363,4.67842662 42.9768137,5.21294275 C42.9761686,8.71100727 42.9422976,15.2839105 42.9306847,17.4364911 L31.8355234,28.5316524 L31.8355234,13.0864911 C32.9977815,11.9116524 38.0655234,6.78907179 40.6977815,4.15584598 C41.075846,3.77778146 41.075846,3.16520082 40.6977815,2.78745888 C40.3193944,2.40907179 39.7064911,2.40971695 39.3287492,2.78745888 C37.3090718,4.80810404 33.8616524,8.28778146 31.8355234,10.3345557 L31.8355234,1.8355234 C31.8355234,1.30100727 31.4022976,0.867781463 30.8677815,0.867781463 C30.3335879,0.867781463 29.9000395,1.30100727 29.9000395,1.8355234 L29.9000395,10.2890718 C29.1613299,9.5439105 28.428104,8.7971363 27.711975,8.06262017 C26.005846,6.31294275 24.2416524,4.5039105 22.3832653,2.76520082 C21.9932653,2.40003953 21.3810073,2.41971695 21.0155234,2.81036211 C20.6503621,3.20068469 20.6706847,3.812942
75 21.0610073,4.17842662 C22.8868137,5.8871363 24.6352008,7.67971695 26.3261686,9.41358791 C27.4861686,10.6029428 28.6845557,11.8264911 29.9000395,13.0197169 L29.9000395,28.5316524 L19.3787492,18.0103621 C19.3735879,17.0690718 19.3293944,9.14487824 19.3290718,5.1771363 C19.3287492,4.64294275 18.895846,4.20939437 18.3610073,4.20971695 C17.8268137,4.20971695 17.3932653,4.64326533 17.3935879,5.17745888 C17.3939105,8.1171363 17.4184266,13.2245557 17.4329428,16.0642331 L11.0229428,9.65455566 C10.6455234,9.27649114 10.0322976,9.27649114 9.65455566,9.65455566 C9.27649114,10.0322976 9.27649114,10.6455234 9.65455566,11.0229428 L15.7800395,17.1484266 C14.8148782,17.1432653 13.8529428,17.1342331 12.9084266,17.1222976 C10.4648782,17.0913299 7.93874921,17.0593944 5.3955234,17.1442331 C4.86132985,17.161975 4.44262017,17.6090718 4.46036211,18.1435879 C4.47810404,18.6777815 4.92262017,19.0968137 5.45971695,19.0784266 C7.95842662,18.995846 10.4626202,19.0271363 12.8842331,19.0574589 C14.1477815,19.0
732653 15.4416524,19.0893944 16.7384266,19.0893944 C17.0639105,19.0893944 17.3893944,19.085846 17.7152008,19.0835879 L28.5316524,29.9000395 L13.2916524,29.9000395 C11.9590718,28.5822976 7.02294275,23.6977815 4.45520082,21.1306847 C4.0771363,20.7535879 3.46455566,20.7532653 3.08681372,21.1310073 C2.70874921,21.5090718 2.70874921,22.121975 3.08681372,22.5000395 C5.07681372,24.4890718 8.48165243,27.8629428 10.5397169,29.9000395 L1.8355234,29.9000395 C1.30132985,29.9000395 0.867781463,30.3332653 0.867781463,30.8677815 C0.867781463,31.4022976 1.30132985,31.8355234 1.8355234,31.8355234 L10.6816524,31.8355234 C9.9055234,32.6064911 9.12616856,33.3713299 8.36003953,34.1184266 C6.61132985,35.8239105 4.80262017,37.5877815 3.06455566,39.4452008 C2.69939437,39.8355234 2.71939437,40.4477815 3.10971695,40.8129428 C3.29649114,40.9874589 3.5339105,41.0742331 3.77100727,41.0742331 C4.02939437,41.0742331 4.2871363,40.9710073 4.47745888,40.7674589 C6.1855234,38.9422976 7.97810404,37.1945557 9.71132985,
35.5042331 C10.9316524,34.3142331 12.1887492,33.0839105 13.4116524,31.8355234 L28.5316524,31.8355234 L17.2216524,43.1455234 C15.5610073,43.1322976 13.8929428,43.1506847 12.2739105,43.1716524 C9.85262017,43.2013299 7.34842662,43.2326202 4.84971695,43.1503621 C4.31520082,43.1377815 3.86810404,43.5510073 3.85003953,44.0855234 C3.83229759,44.6197169 4.25100727,45.0671363 4.7855234,45.0845557 C7.32842662,45.1690718 9.85455566,45.1371363 12.2984266,45.1068137 C13.2806847,45.0945557 14.2822976,45.0852008 15.2864911,45.0806847 L9.65455566,50.7126202 C9.27649114,51.0900395 9.27649114,51.7032653 9.65455566,52.0810073 C9.84358791,52.2700395 10.0913299,52.3645557 10.3387492,52.3645557 C10.5864911,52.3645557 10.8342331,52.2700395 11.0229428,52.0810073 L16.821975,46.281975 C16.8074589,49.1426202 16.7839105,54.1516524 16.7835879,57.0513299 C16.7832653,57.585846 17.2168137,58.0193944 17.7510073,58.0193944 C18.2855234,58.0193944 18.7187492,57.5861686 18.7190718,57.051975 C18.7197169,53.2174589 18.76
06847,45.6877815 18.7677815,44.3361686 L29.9000395,33.2039105 L29.9000395,48.715846 C28.6839105,49.9100395 27.4848782,51.1339105 26.3242331,52.3239105 C24.6339105,54.0571363 22.8861686,55.8490718 21.0610073,57.5571363 C20.6706847,57.9222976 20.6503621,58.5348782 21.0155234,58.9252008 C21.2061686,59.1284266 21.4639105,59.2316524 21.7222976,59.2316524 C21.9593944,59.2316524 22.1968137,59.1448782 22.3832653,58.9703621 C24.2410073,57.231975 26.0045557,55.4239105 27.7100395,53.6752008 C28.4271363,52.9400395 29.1610073,52.1922976 29.9000395,51.4468137 L29.9000395,59.9000395 C29.9000395,60.4345557 30.3335879,60.8677815 30.8677815,60.8677815 C31.4022976,60.8677815 31.8355234,60.4345557 31.8355234,59.9000395 L31.8355234,51.4010073 C33.8616524,53.448104 37.3090718,56.9271363 39.3287492,58.948104 C39.7068137,59.325846 40.3193944,59.3261686 40.6977815,58.9484266 C41.075846,58.5703621 41.075846,57.9577815 40.6977815,57.5797169 C38.0655234,54.9468137 32.9977815,49.8242331 31.8355234,48.6493944 L3
1.8355234,33.2039105 L42.735846,44.1042331 C42.7442331,45.6068137 42.7839105,52.9790718 42.7845557,56.7587492 C42.7848782,57.2932653 43.218104,57.7264911 43.7526202,57.7264911 C44.2871363,57.7264911 44.7203621,57.2929428 44.7200395,56.7587492 C44.7197169,53.8793944 44.6964911,48.9210073 44.681975,46.0500395 L50.7126202,52.0810073 C50.9013299,52.2700395 51.1490718,52.3645557 51.3968137,52.3645557 C51.6442331,52.3645557 51.8922976,52.2700395 52.0810073,52.0810073 C52.4590718,51.7032653 52.4590718,51.0900395 52.0810073,50.7126202 L46.1561686,44.7874589 C47.1806847,44.7922976 48.2029428,44.8013299 49.2055234,44.8139105 C51.6487492,44.8448782 54.1745557,44.8768137 56.7184266,44.791975 C57.2526202,44.7742331 57.6713299,44.3271363 57.6535879,43.7926202 C57.6355234,43.2584266 57.1955234,42.8461686 56.6539105,42.8577815 C54.1548782,42.9400395 51.6510073,42.9087492 49.2297169,42.8787492 C47.5913299,42.858104 45.9026202,42.8390718 44.2216524,42.8532653 L33.2039105,31.8355234 L48.8506847,31.835
5234 C50.0735879,33.0839105 51.3310073,34.3142331 52.5510073,35.5042331 C54.2845557,37.1945557 56.0764911,38.9422976 57.7845557,40.7674589 C57.9752008,40.9710073 58.2329428,41.0742331 58.4916524,41.0742331 C58.7284266,41.0742331 58.965846,40.9874589 59.1526202,40.8129428 C59.5429428,40.4477815 59.5632653,39.8355234 59.1977815,39.4452008 C57.4597169,37.5877815 55.6513299,35.8239105 53.9022976,34.1184266 C53.1361686,33.3713299 52.3568137,32.6064911 51.5806847,31.8355234 L59.9000395,31.8355234 C60.4345557,31.8355234 60.8677815,31.4022976 60.8677815,30.8677815 C60.8677815,30.3332653 60.4345557,29.9000395 59.9000395,29.9000395 L51.7222976,29.9000395 Z" id="Fill-4" fill="#8000D7"></path>
- </g>
-</svg>
\ No newline at end of file
diff --git a/proxy/static/assets/status-running.svg b/proxy/static/assets/status-running.svg
deleted file mode 100644
index dffb7ea..0000000
--- a/proxy/static/assets/status-running.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>status-on</title>
- <g id="Snowflake-Extension" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <path d="M51.7222976,29.9000395 C53.7806847,27.8629428 57.1855234,24.4890718 59.1755234,22.5000395 C59.5535879,22.121975 59.5535879,21.5090718 59.175846,21.1310073 C58.7977815,20.7532653 58.1855234,20.7535879 57.8071363,21.1306847 C55.2393944,23.6977815 50.3032653,28.5822976 48.9706847,29.9000395 L33.2039105,29.9000395 L43.9887492,19.1152008 C44.5145557,19.1216524 45.0410073,19.1252008 45.5674589,19.1252008 C46.8642331,19.1252008 48.1584266,19.1090718 49.421975,19.0929428 C51.8429428,19.0626202 54.3471363,19.0316524 56.8461686,19.1139105 C57.3874589,19.1271363 57.8277815,18.7132653 57.845846,18.1790718 C57.8635879,17.6448782 57.4448782,17.1974589 56.9103621,17.1797169 C54.3668137,17.0952008 51.8410073,17.1268137 49.3974589,17.1577815 C48.2548782,17.171975 47.0874589,17.1822976 45.9187492,17.1852008 L52.0810073,11.0229428 C52.4590718,10.6455234 52.4590718,10.0322976 52.0810073,9.65455566 C51.7032653,9.27649114 51.0900395,9.27649114 50.7126202,9.65455566 L44.8761686,15.4910073
C44.8910073,12.575846 44.9116524,7.95262017 44.9122976,5.21326533 C44.9126202,4.67874921 44.4790718,4.2455234 43.9448782,4.24520082 C43.4103621,4.24520082 42.9771363,4.67842662 42.9768137,5.21294275 C42.9761686,8.71100727 42.9422976,15.2839105 42.9306847,17.4364911 L31.8355234,28.5316524 L31.8355234,13.0864911 C32.9977815,11.9116524 38.0655234,6.78907179 40.6977815,4.15584598 C41.075846,3.77778146 41.075846,3.16520082 40.6977815,2.78745888 C40.3193944,2.40907179 39.7064911,2.40971695 39.3287492,2.78745888 C37.3090718,4.80810404 33.8616524,8.28778146 31.8355234,10.3345557 L31.8355234,1.8355234 C31.8355234,1.30100727 31.4022976,0.867781463 30.8677815,0.867781463 C30.3335879,0.867781463 29.9000395,1.30100727 29.9000395,1.8355234 L29.9000395,10.2890718 C29.1613299,9.5439105 28.428104,8.7971363 27.711975,8.06262017 C26.005846,6.31294275 24.2416524,4.5039105 22.3832653,2.76520082 C21.9932653,2.40003953 21.3810073,2.41971695 21.0155234,2.81036211 C20.6503621,3.20068469 20.6706847,3.812942
75 21.0610073,4.17842662 C22.8868137,5.8871363 24.6352008,7.67971695 26.3261686,9.41358791 C27.4861686,10.6029428 28.6845557,11.8264911 29.9000395,13.0197169 L29.9000395,28.5316524 L19.3787492,18.0103621 C19.3735879,17.0690718 19.3293944,9.14487824 19.3290718,5.1771363 C19.3287492,4.64294275 18.895846,4.20939437 18.3610073,4.20971695 C17.8268137,4.20971695 17.3932653,4.64326533 17.3935879,5.17745888 C17.3939105,8.1171363 17.4184266,13.2245557 17.4329428,16.0642331 L11.0229428,9.65455566 C10.6455234,9.27649114 10.0322976,9.27649114 9.65455566,9.65455566 C9.27649114,10.0322976 9.27649114,10.6455234 9.65455566,11.0229428 L15.7800395,17.1484266 C14.8148782,17.1432653 13.8529428,17.1342331 12.9084266,17.1222976 C10.4648782,17.0913299 7.93874921,17.0593944 5.3955234,17.1442331 C4.86132985,17.161975 4.44262017,17.6090718 4.46036211,18.1435879 C4.47810404,18.6777815 4.92262017,19.0968137 5.45971695,19.0784266 C7.95842662,18.995846 10.4626202,19.0271363 12.8842331,19.0574589 C14.1477815,19.0
732653 15.4416524,19.0893944 16.7384266,19.0893944 C17.0639105,19.0893944 17.3893944,19.085846 17.7152008,19.0835879 L28.5316524,29.9000395 L13.2916524,29.9000395 C11.9590718,28.5822976 7.02294275,23.6977815 4.45520082,21.1306847 C4.0771363,20.7535879 3.46455566,20.7532653 3.08681372,21.1310073 C2.70874921,21.5090718 2.70874921,22.121975 3.08681372,22.5000395 C5.07681372,24.4890718 8.48165243,27.8629428 10.5397169,29.9000395 L1.8355234,29.9000395 C1.30132985,29.9000395 0.867781463,30.3332653 0.867781463,30.8677815 C0.867781463,31.4022976 1.30132985,31.8355234 1.8355234,31.8355234 L10.6816524,31.8355234 C9.9055234,32.6064911 9.12616856,33.3713299 8.36003953,34.1184266 C6.61132985,35.8239105 4.80262017,37.5877815 3.06455566,39.4452008 C2.69939437,39.8355234 2.71939437,40.4477815 3.10971695,40.8129428 C3.29649114,40.9874589 3.5339105,41.0742331 3.77100727,41.0742331 C4.02939437,41.0742331 4.2871363,40.9710073 4.47745888,40.7674589 C6.1855234,38.9422976 7.97810404,37.1945557 9.71132985,
35.5042331 C10.9316524,34.3142331 12.1887492,33.0839105 13.4116524,31.8355234 L28.5316524,31.8355234 L17.2216524,43.1455234 C15.5610073,43.1322976 13.8929428,43.1506847 12.2739105,43.1716524 C9.85262017,43.2013299 7.34842662,43.2326202 4.84971695,43.1503621 C4.31520082,43.1377815 3.86810404,43.5510073 3.85003953,44.0855234 C3.83229759,44.6197169 4.25100727,45.0671363 4.7855234,45.0845557 C7.32842662,45.1690718 9.85455566,45.1371363 12.2984266,45.1068137 C13.2806847,45.0945557 14.2822976,45.0852008 15.2864911,45.0806847 L9.65455566,50.7126202 C9.27649114,51.0900395 9.27649114,51.7032653 9.65455566,52.0810073 C9.84358791,52.2700395 10.0913299,52.3645557 10.3387492,52.3645557 C10.5864911,52.3645557 10.8342331,52.2700395 11.0229428,52.0810073 L16.821975,46.281975 C16.8074589,49.1426202 16.7839105,54.1516524 16.7835879,57.0513299 C16.7832653,57.585846 17.2168137,58.0193944 17.7510073,58.0193944 C18.2855234,58.0193944 18.7187492,57.5861686 18.7190718,57.051975 C18.7197169,53.2174589 18.76
06847,45.6877815 18.7677815,44.3361686 L29.9000395,33.2039105 L29.9000395,48.715846 C28.6839105,49.9100395 27.4848782,51.1339105 26.3242331,52.3239105 C24.6339105,54.0571363 22.8861686,55.8490718 21.0610073,57.5571363 C20.6706847,57.9222976 20.6503621,58.5348782 21.0155234,58.9252008 C21.2061686,59.1284266 21.4639105,59.2316524 21.7222976,59.2316524 C21.9593944,59.2316524 22.1968137,59.1448782 22.3832653,58.9703621 C24.2410073,57.231975 26.0045557,55.4239105 27.7100395,53.6752008 C28.4271363,52.9400395 29.1610073,52.1922976 29.9000395,51.4468137 L29.9000395,59.9000395 C29.9000395,60.4345557 30.3335879,60.8677815 30.8677815,60.8677815 C31.4022976,60.8677815 31.8355234,60.4345557 31.8355234,59.9000395 L31.8355234,51.4010073 C33.8616524,53.448104 37.3090718,56.9271363 39.3287492,58.948104 C39.7068137,59.325846 40.3193944,59.3261686 40.6977815,58.9484266 C41.075846,58.5703621 41.075846,57.9577815 40.6977815,57.5797169 C38.0655234,54.9468137 32.9977815,49.8242331 31.8355234,48.6493944 L3
1.8355234,33.2039105 L42.735846,44.1042331 C42.7442331,45.6068137 42.7839105,52.9790718 42.7845557,56.7587492 C42.7848782,57.2932653 43.218104,57.7264911 43.7526202,57.7264911 C44.2871363,57.7264911 44.7203621,57.2929428 44.7200395,56.7587492 C44.7197169,53.8793944 44.6964911,48.9210073 44.681975,46.0500395 L50.7126202,52.0810073 C50.9013299,52.2700395 51.1490718,52.3645557 51.3968137,52.3645557 C51.6442331,52.3645557 51.8922976,52.2700395 52.0810073,52.0810073 C52.4590718,51.7032653 52.4590718,51.0900395 52.0810073,50.7126202 L46.1561686,44.7874589 C47.1806847,44.7922976 48.2029428,44.8013299 49.2055234,44.8139105 C51.6487492,44.8448782 54.1745557,44.8768137 56.7184266,44.791975 C57.2526202,44.7742331 57.6713299,44.3271363 57.6535879,43.7926202 C57.6355234,43.2584266 57.1955234,42.8461686 56.6539105,42.8577815 C54.1548782,42.9400395 51.6510073,42.9087492 49.2297169,42.8787492 C47.5913299,42.858104 45.9026202,42.8390718 44.2216524,42.8532653 L33.2039105,31.8355234 L48.8506847,31.835
5234 C50.0735879,33.0839105 51.3310073,34.3142331 52.5510073,35.5042331 C54.2845557,37.1945557 56.0764911,38.9422976 57.7845557,40.7674589 C57.9752008,40.9710073 58.2329428,41.0742331 58.4916524,41.0742331 C58.7284266,41.0742331 58.965846,40.9874589 59.1526202,40.8129428 C59.5429428,40.4477815 59.5632653,39.8355234 59.1977815,39.4452008 C57.4597169,37.5877815 55.6513299,35.8239105 53.9022976,34.1184266 C53.1361686,33.3713299 52.3568137,32.6064911 51.5806847,31.8355234 L59.9000395,31.8355234 C60.4345557,31.8355234 60.8677815,31.4022976 60.8677815,30.8677815 C60.8677815,30.3332653 60.4345557,29.9000395 59.9000395,29.9000395 L51.7222976,29.9000395 Z" id="Fill-4" fill="#68B030"></path>
- </g>
-</svg>
diff --git a/proxy/static/assets/toolbar-off-48.png b/proxy/static/assets/toolbar-off-48.png
deleted file mode 100644
index 9a28a6f..0000000
Binary files a/proxy/static/assets/toolbar-off-48.png and /dev/null differ
diff --git a/proxy/static/assets/toolbar-off-96.png b/proxy/static/assets/toolbar-off-96.png
deleted file mode 100644
index d022b51..0000000
Binary files a/proxy/static/assets/toolbar-off-96.png and /dev/null differ
diff --git a/proxy/static/assets/toolbar-off.ico b/proxy/static/assets/toolbar-off.ico
deleted file mode 100644
index 5b6f875..0000000
Binary files a/proxy/static/assets/toolbar-off.ico and /dev/null differ
diff --git a/proxy/static/assets/toolbar-off.svg b/proxy/static/assets/toolbar-off.svg
deleted file mode 100644
index 2b35669..0000000
--- a/proxy/static/assets/toolbar-off.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
- <title>toolbar_icon_grey</title>
- <desc>Created with Sketch.</desc>
- <g id="Snowflake-Extension" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <g id="Group-2" transform="translate(-268.000000, -68.000000)">
- <g id="toolbar_icon_grey" transform="translate(268.000000, 68.000000)">
- <circle id="container" fill="#FFFFFF" cx="32" cy="32" r="32"></circle>
- <path d="M57.1612903,31.1612903 L50.073914,31.1612903 C51.8578495,29.3958065 54.8087097,26.4717849 56.5333763,24.747957 C56.8610323,24.4203011 56.8610323,23.8891183 56.5336559,23.5614624 C56.206,23.234086 55.6753763,23.2343656 55.3474409,23.5611828 C53.1220645,25.786 48.844086,30.0192473 47.6891828,31.1612903 L34.0246452,31.1612903 L43.3715054,21.8144301 C43.8272043,21.8200215 44.2834624,21.8230968 44.7397204,21.8230968 C45.8635914,21.8230968 46.9852258,21.8091183 48.0803011,21.7951398 C50.1784731,21.7688602 52.3487742,21.7420215 54.5146022,21.8133118 C54.9837204,21.8247742 55.3653333,21.466086 55.3809892,21.0031183 C55.3963656,20.5401505 55.0334839,20.1523871 54.5702366,20.1370108 C52.365828,20.0637634 50.1767957,20.0911613 48.0590538,20.118 C47.0688172,20.1303011 46.0570538,20.1392473 45.044172,20.1417634 L50.3847957,14.8011398 C50.7124516,14.474043 50.7124516,13.9425806 50.3847957,13.6152043 C50.0574194,13.2875484 49.525957,13.2875484 49.1988602,13.6152043 L44.140
6022,18.6734624 C44.1534624,16.1469892 44.1713548,12.1401935 44.171914,9.76608602 C44.1721935,9.30283871 43.7964516,8.92737634 43.3334839,8.92709677 L43.3332043,8.92709677 C42.8702366,8.92709677 42.4947742,9.30255914 42.4944946,9.76580645 C42.4939355,12.7974624 42.4645806,18.4939785 42.4545161,20.3595484 L32.8387097,29.9753548 L32.8387097,16.5895484 C33.846,15.5713548 38.238043,11.1317849 40.5193333,8.84965591 C40.8469892,8.522 40.8469892,7.99109677 40.5193333,7.66372043 C40.1913978,7.33578495 39.6602151,7.33634409 39.3328387,7.66372043 C37.5824516,9.41494624 34.5946882,12.4306667 32.8387097,14.2045376 L32.8387097,6.83870968 C32.8387097,6.37546237 32.4632473,6 32,6 C31.5370323,6 31.1612903,6.37546237 31.1612903,6.83870968 L31.1612903,14.1651183 C30.5210753,13.5193118 29.8856129,12.8721075 29.2649677,12.2355269 C27.7863226,10.7191398 26.2573548,9.15131183 24.6467527,7.64443011 C24.3087527,7.32795699 23.778129,7.34501075 23.4613763,7.68356989 C23.1449032,8.02184946 23.1625161,8.552473
12 23.5007957,8.86922581 C25.0831613,10.3501075 26.5984301,11.9036774 28.0639355,13.4063656 C29.0692688,14.4371398 30.107871,15.4975484 31.1612903,16.5316774 L31.1612903,29.9753548 L22.0428387,20.8569032 C22.0383656,20.0411183 22.0000645,13.1734839 21.9997849,9.73477419 C21.9995054,9.27180645 21.6243226,8.89606452 21.1607957,8.89634409 C20.697828,8.89634409 20.322086,9.27208602 20.3223656,9.73505376 C20.3226452,12.2827742 20.3438925,16.7092043 20.3564731,19.1702581 L14.8011398,13.6152043 C14.474043,13.2875484 13.9425806,13.2875484 13.6152043,13.6152043 C13.2875484,13.9425806 13.2875484,14.474043 13.6152043,14.8011398 L18.923957,20.1098925 C18.0874839,20.1054194 17.2538065,20.0975914 16.4352258,20.0872473 C14.3174839,20.0604086 12.128172,20.0327312 9.92404301,20.1062581 C9.46107527,20.1216344 9.09819355,20.5091183 9.11356989,20.9723656 C9.12894624,21.4353333 9.51419355,21.7984946 9.97967742,21.7825591 C12.1452258,21.7109892 14.3155269,21.7381075 16.4142581,21.7643871 C17.5093333,21.7
78086 18.6306882,21.7920645 19.7545591,21.7920645 C20.0366452,21.7920645 20.3187312,21.7889892 20.6010968,21.7870323 L29.9753548,31.1612903 L16.7673548,31.1612903 C15.6124516,30.0192473 11.3344731,25.786 9.10909677,23.5611828 C8.78144086,23.2343656 8.25053763,23.234086 7.92316129,23.5614624 C7.59550538,23.8891183 7.59550538,24.4203011 7.92316129,24.747957 C9.64782796,26.4717849 12.5986882,29.3958065 14.3823441,31.1612903 L6.83870968,31.1612903 C6.37574194,31.1612903 6,31.5367527 6,32 C6,32.4632473 6.37574194,32.8387097 6.83870968,32.8387097 L14.5053548,32.8387097 C13.8327097,33.5068817 13.1572688,34.1697419 12.4932903,34.8172258 C10.9777419,36.2953118 9.41019355,37.824 7.90387097,39.4337634 C7.58739785,39.772043 7.60473118,40.3026667 7.94301075,40.6191398 C8.10488172,40.7703871 8.31064516,40.8455914 8.51612903,40.8455914 C8.74006452,40.8455914 8.96344086,40.756129 9.1283871,40.5797204 C10.6087097,38.997914 12.1622796,37.4832043 13.6644086,36.0182581 C14.7220215,34.9869247 15.8115054
,33.9206452 16.8713548,32.8387097 L29.9753548,32.8387097 L20.1733548,42.6407097 C18.734129,42.6292473 17.2884731,42.6451828 15.8853118,42.6633548 C13.7868602,42.6890753 11.6165591,42.7161935 9.45101075,42.6449032 C8.98776344,42.634 8.60027957,42.992129 8.58462366,43.4553763 C8.56924731,43.9183441 8.93212903,44.3061075 9.39537634,44.3212043 C11.5992258,44.3944516 13.7885376,44.3667742 15.9065591,44.3404946 C16.7578495,44.329871 17.625914,44.3217634 18.4962151,44.3178495 L13.6152043,49.1988602 C13.2875484,49.525957 13.2875484,50.0574194 13.6152043,50.3847957 C13.7790323,50.5486237 13.9937419,50.6305376 14.208172,50.6305376 C14.4228817,50.6305376 14.6375914,50.5486237 14.8011398,50.3847957 L19.8269677,45.3589677 C19.8143871,47.8381935 19.7939785,52.1793548 19.7936989,54.6924086 C19.7934194,55.1556559 20.1691613,55.5313978 20.632129,55.5313978 L20.6324086,55.5313978 C21.0953763,55.5313978 21.4708387,55.1559355 21.4711183,54.6929677 C21.4716774,51.3697204 21.5071828,44.844 21.5133333,43.
6726022 L31.1612903,34.0246452 L31.1612903,47.4683226 C30.1073118,48.5032903 29.0681505,49.5639785 28.0622581,50.5953118 C26.5973118,52.0974409 25.0826022,53.6504516 23.5007957,55.1307742 C23.1625161,55.4472473 23.1449032,55.9781505 23.4613763,56.3164301 C23.6266022,56.4925591 23.8499785,56.5820215 24.073914,56.5820215 C24.2793978,56.5820215 24.4851613,56.5068172 24.6467527,56.3555699 C26.2567957,54.8489677 27.7852043,53.2819785 29.2632903,51.7664301 C29.8847742,51.1292903 30.5207957,50.4812473 31.1612903,49.8351613 L31.1612903,57.1612903 C31.1612903,57.6245376 31.5370323,58 32,58 C32.4632473,58 32.8387097,57.6245376 32.8387097,57.1612903 L32.8387097,49.7954624 C34.5946882,51.5696129 37.5824516,54.5847742 39.3328387,56.3362796 C39.6604946,56.6636559 40.1913978,56.6639355 40.5193333,56.3365591 C40.8469892,56.0089032 40.8469892,55.478 40.5193333,55.1503441 C38.238043,52.8684946 33.846,48.4289247 32.8387097,47.4107312 L32.8387097,34.0246452 L42.2856559,43.4715914 C42.2929247,44.773828
42.3273118,51.1631183 42.327871,54.4388387 C42.3281505,54.902086 42.7036129,55.2775484 43.1668602,55.2775484 C43.6301075,55.2775484 44.0055699,54.9018065 44.0052903,54.4388387 C44.0050108,51.9433978 43.9848817,47.646129 43.9723011,45.157957 L49.1988602,50.3847957 C49.3624086,50.5486237 49.5771183,50.6305376 49.791828,50.6305376 C50.0062581,50.6305376 50.2212473,50.5486237 50.3847957,50.3847957 C50.7124516,50.0574194 50.7124516,49.525957 50.3847957,49.1988602 L45.2499355,44.0637204 C46.1378495,44.067914 47.0238065,44.0757419 47.8927097,44.0866452 C50.010172,44.1134839 52.1992043,44.1411613 54.4038925,44.0676344 C54.8668602,44.0522581 55.2297419,43.6647742 55.2143656,43.2015269 C55.1987097,42.7385591 54.8173763,42.3812688 54.3479785,42.3913333 C52.1821505,42.4626237 50.012129,42.4355054 47.9136774,42.4095054 C46.4937419,42.3916129 45.0301935,42.3751183 43.5733548,42.3874194 L34.0246452,32.8387097 L47.5851828,32.8387097 C48.6450323,33.9206452 49.7347957,34.9869247 50.792129,36.0182581
C52.2945376,37.4832043 53.8475484,38.997914 55.327871,40.5797204 C55.4930968,40.756129 55.7164731,40.8455914 55.9406882,40.8455914 C56.1458925,40.8455914 56.3516559,40.7703871 56.5135269,40.6191398 C56.8518065,40.3026667 56.8694194,39.772043 56.5526667,39.4337634 C55.0463441,37.824 53.4790753,36.2953118 51.9632473,34.8172258 C51.2992688,34.1697419 50.623828,33.5068817 49.9511828,32.8387097 L57.1612903,32.8387097 C57.6245376,32.8387097 58,32.4632473 58,32 C58,31.5367527 57.6245376,31.1612903 57.1612903,31.1612903" id="icon" stroke="#4A4A4F" fill="#4A4A4F" stroke-linecap="square" stroke-linejoin="bevel"></path>
- </g>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/proxy/static/assets/toolbar-on-48.png b/proxy/static/assets/toolbar-on-48.png
deleted file mode 100644
index 990ab30..0000000
Binary files a/proxy/static/assets/toolbar-on-48.png and /dev/null differ
diff --git a/proxy/static/assets/toolbar-on-96.png b/proxy/static/assets/toolbar-on-96.png
deleted file mode 100644
index d0226b6..0000000
Binary files a/proxy/static/assets/toolbar-on-96.png and /dev/null differ
diff --git a/proxy/static/assets/toolbar-on.ico b/proxy/static/assets/toolbar-on.ico
deleted file mode 100644
index d015872..0000000
Binary files a/proxy/static/assets/toolbar-on.ico and /dev/null differ
diff --git a/proxy/static/assets/toolbar-on.svg b/proxy/static/assets/toolbar-on.svg
deleted file mode 100644
index 70c079a..0000000
--- a/proxy/static/assets/toolbar-on.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
- <title>toolbar_icon_purple</title>
- <desc>Created with Sketch.</desc>
- <g id="Snowflake-Extension" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <g id="Group-2" transform="translate(-388.000000, -68.000000)">
- <g id="toolbar_icon_purple" transform="translate(388.000000, 68.000000)">
- <circle id="container" fill="#FFFFFF" cx="32" cy="32" r="32"></circle>
- <path d="M57.1612903,31.1612903 L50.073914,31.1612903 C51.8578495,29.3958065 54.8087097,26.4717849 56.5333763,24.747957 C56.8610323,24.4203011 56.8610323,23.8891183 56.5336559,23.5614624 C56.206,23.234086 55.6753763,23.2343656 55.3474409,23.5611828 C53.1220645,25.786 48.844086,30.0192473 47.6891828,31.1612903 L34.0246452,31.1612903 L43.3715054,21.8144301 C43.8272043,21.8200215 44.2834624,21.8230968 44.7397204,21.8230968 C45.8635914,21.8230968 46.9852258,21.8091183 48.0803011,21.7951398 C50.1784731,21.7688602 52.3487742,21.7420215 54.5146022,21.8133118 C54.9837204,21.8247742 55.3653333,21.466086 55.3809892,21.0031183 C55.3963656,20.5401505 55.0334839,20.1523871 54.5702366,20.1370108 C52.365828,20.0637634 50.1767957,20.0911613 48.0590538,20.118 C47.0688172,20.1303011 46.0570538,20.1392473 45.044172,20.1417634 L50.3847957,14.8011398 C50.7124516,14.474043 50.7124516,13.9425806 50.3847957,13.6152043 C50.0574194,13.2875484 49.525957,13.2875484 49.1988602,13.6152043 L44.140
6022,18.6734624 C44.1534624,16.1469892 44.1713548,12.1401935 44.171914,9.76608602 C44.1721935,9.30283871 43.7964516,8.92737634 43.3334839,8.92709677 L43.3332043,8.92709677 C42.8702366,8.92709677 42.4947742,9.30255914 42.4944946,9.76580645 C42.4939355,12.7974624 42.4645806,18.4939785 42.4545161,20.3595484 L32.8387097,29.9753548 L32.8387097,16.5895484 C33.846,15.5713548 38.238043,11.1317849 40.5193333,8.84965591 C40.8469892,8.522 40.8469892,7.99109677 40.5193333,7.66372043 C40.1913978,7.33578495 39.6602151,7.33634409 39.3328387,7.66372043 C37.5824516,9.41494624 34.5946882,12.4306667 32.8387097,14.2045376 L32.8387097,6.83870968 C32.8387097,6.37546237 32.4632473,6 32,6 C31.5370323,6 31.1612903,6.37546237 31.1612903,6.83870968 L31.1612903,14.1651183 C30.5210753,13.5193118 29.8856129,12.8721075 29.2649677,12.2355269 C27.7863226,10.7191398 26.2573548,9.15131183 24.6467527,7.64443011 C24.3087527,7.32795699 23.778129,7.34501075 23.4613763,7.68356989 C23.1449032,8.02184946 23.1625161,8.552473
12 23.5007957,8.86922581 C25.0831613,10.3501075 26.5984301,11.9036774 28.0639355,13.4063656 C29.0692688,14.4371398 30.107871,15.4975484 31.1612903,16.5316774 L31.1612903,29.9753548 L22.0428387,20.8569032 C22.0383656,20.0411183 22.0000645,13.1734839 21.9997849,9.73477419 C21.9995054,9.27180645 21.6243226,8.89606452 21.1607957,8.89634409 C20.697828,8.89634409 20.322086,9.27208602 20.3223656,9.73505376 C20.3226452,12.2827742 20.3438925,16.7092043 20.3564731,19.1702581 L14.8011398,13.6152043 C14.474043,13.2875484 13.9425806,13.2875484 13.6152043,13.6152043 C13.2875484,13.9425806 13.2875484,14.474043 13.6152043,14.8011398 L18.923957,20.1098925 C18.0874839,20.1054194 17.2538065,20.0975914 16.4352258,20.0872473 C14.3174839,20.0604086 12.128172,20.0327312 9.92404301,20.1062581 C9.46107527,20.1216344 9.09819355,20.5091183 9.11356989,20.9723656 C9.12894624,21.4353333 9.51419355,21.7984946 9.97967742,21.7825591 C12.1452258,21.7109892 14.3155269,21.7381075 16.4142581,21.7643871 C17.5093333,21.7
78086 18.6306882,21.7920645 19.7545591,21.7920645 C20.0366452,21.7920645 20.3187312,21.7889892 20.6010968,21.7870323 L29.9753548,31.1612903 L16.7673548,31.1612903 C15.6124516,30.0192473 11.3344731,25.786 9.10909677,23.5611828 C8.78144086,23.2343656 8.25053763,23.234086 7.92316129,23.5614624 C7.59550538,23.8891183 7.59550538,24.4203011 7.92316129,24.747957 C9.64782796,26.4717849 12.5986882,29.3958065 14.3823441,31.1612903 L6.83870968,31.1612903 C6.37574194,31.1612903 6,31.5367527 6,32 C6,32.4632473 6.37574194,32.8387097 6.83870968,32.8387097 L14.5053548,32.8387097 C13.8327097,33.5068817 13.1572688,34.1697419 12.4932903,34.8172258 C10.9777419,36.2953118 9.41019355,37.824 7.90387097,39.4337634 C7.58739785,39.772043 7.60473118,40.3026667 7.94301075,40.6191398 C8.10488172,40.7703871 8.31064516,40.8455914 8.51612903,40.8455914 C8.74006452,40.8455914 8.96344086,40.756129 9.1283871,40.5797204 C10.6087097,38.997914 12.1622796,37.4832043 13.6644086,36.0182581 C14.7220215,34.9869247 15.8115054
,33.9206452 16.8713548,32.8387097 L29.9753548,32.8387097 L20.1733548,42.6407097 C18.734129,42.6292473 17.2884731,42.6451828 15.8853118,42.6633548 C13.7868602,42.6890753 11.6165591,42.7161935 9.45101075,42.6449032 C8.98776344,42.634 8.60027957,42.992129 8.58462366,43.4553763 C8.56924731,43.9183441 8.93212903,44.3061075 9.39537634,44.3212043 C11.5992258,44.3944516 13.7885376,44.3667742 15.9065591,44.3404946 C16.7578495,44.329871 17.625914,44.3217634 18.4962151,44.3178495 L13.6152043,49.1988602 C13.2875484,49.525957 13.2875484,50.0574194 13.6152043,50.3847957 C13.7790323,50.5486237 13.9937419,50.6305376 14.208172,50.6305376 C14.4228817,50.6305376 14.6375914,50.5486237 14.8011398,50.3847957 L19.8269677,45.3589677 C19.8143871,47.8381935 19.7939785,52.1793548 19.7936989,54.6924086 C19.7934194,55.1556559 20.1691613,55.5313978 20.632129,55.5313978 L20.6324086,55.5313978 C21.0953763,55.5313978 21.4708387,55.1559355 21.4711183,54.6929677 C21.4716774,51.3697204 21.5071828,44.844 21.5133333,43.
6726022 L31.1612903,34.0246452 L31.1612903,47.4683226 C30.1073118,48.5032903 29.0681505,49.5639785 28.0622581,50.5953118 C26.5973118,52.0974409 25.0826022,53.6504516 23.5007957,55.1307742 C23.1625161,55.4472473 23.1449032,55.9781505 23.4613763,56.3164301 C23.6266022,56.4925591 23.8499785,56.5820215 24.073914,56.5820215 C24.2793978,56.5820215 24.4851613,56.5068172 24.6467527,56.3555699 C26.2567957,54.8489677 27.7852043,53.2819785 29.2632903,51.7664301 C29.8847742,51.1292903 30.5207957,50.4812473 31.1612903,49.8351613 L31.1612903,57.1612903 C31.1612903,57.6245376 31.5370323,58 32,58 C32.4632473,58 32.8387097,57.6245376 32.8387097,57.1612903 L32.8387097,49.7954624 C34.5946882,51.5696129 37.5824516,54.5847742 39.3328387,56.3362796 C39.6604946,56.6636559 40.1913978,56.6639355 40.5193333,56.3365591 C40.8469892,56.0089032 40.8469892,55.478 40.5193333,55.1503441 C38.238043,52.8684946 33.846,48.4289247 32.8387097,47.4107312 L32.8387097,34.0246452 L42.2856559,43.4715914 C42.2929247,44.773828
42.3273118,51.1631183 42.327871,54.4388387 C42.3281505,54.902086 42.7036129,55.2775484 43.1668602,55.2775484 C43.6301075,55.2775484 44.0055699,54.9018065 44.0052903,54.4388387 C44.0050108,51.9433978 43.9848817,47.646129 43.9723011,45.157957 L49.1988602,50.3847957 C49.3624086,50.5486237 49.5771183,50.6305376 49.791828,50.6305376 C50.0062581,50.6305376 50.2212473,50.5486237 50.3847957,50.3847957 C50.7124516,50.0574194 50.7124516,49.525957 50.3847957,49.1988602 L45.2499355,44.0637204 C46.1378495,44.067914 47.0238065,44.0757419 47.8927097,44.0866452 C50.010172,44.1134839 52.1992043,44.1411613 54.4038925,44.0676344 C54.8668602,44.0522581 55.2297419,43.6647742 55.2143656,43.2015269 C55.1987097,42.7385591 54.8173763,42.3812688 54.3479785,42.3913333 C52.1821505,42.4626237 50.012129,42.4355054 47.9136774,42.4095054 C46.4937419,42.3916129 45.0301935,42.3751183 43.5733548,42.3874194 L34.0246452,32.8387097 L47.5851828,32.8387097 C48.6450323,33.9206452 49.7347957,34.9869247 50.792129,36.0182581
C52.2945376,37.4832043 53.8475484,38.997914 55.327871,40.5797204 C55.4930968,40.756129 55.7164731,40.8455914 55.9406882,40.8455914 C56.1458925,40.8455914 56.3516559,40.7703871 56.5135269,40.6191398 C56.8518065,40.3026667 56.8694194,39.772043 56.5526667,39.4337634 C55.0463441,37.824 53.4790753,36.2953118 51.9632473,34.8172258 C51.2992688,34.1697419 50.623828,33.5068817 49.9511828,32.8387097 L57.1612903,32.8387097 C57.6245376,32.8387097 58,32.4632473 58,32 C58,31.5367527 57.6245376,31.1612903 57.1612903,31.1612903" id="icon" stroke="#6200A4" fill="#6200A4" stroke-linecap="square" stroke-linejoin="bevel"></path>
- </g>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/proxy/static/assets/toolbar-running-48.png b/proxy/static/assets/toolbar-running-48.png
deleted file mode 100644
index 9df5476..0000000
Binary files a/proxy/static/assets/toolbar-running-48.png and /dev/null differ
diff --git a/proxy/static/assets/toolbar-running-96.png b/proxy/static/assets/toolbar-running-96.png
deleted file mode 100644
index 956c7d1..0000000
Binary files a/proxy/static/assets/toolbar-running-96.png and /dev/null differ
diff --git a/proxy/static/assets/toolbar-running.ico b/proxy/static/assets/toolbar-running.ico
deleted file mode 100644
index c414520..0000000
Binary files a/proxy/static/assets/toolbar-running.ico and /dev/null differ
diff --git a/proxy/static/assets/toolbar-running.svg b/proxy/static/assets/toolbar-running.svg
deleted file mode 100644
index 5599c87..0000000
--- a/proxy/static/assets/toolbar-running.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
- <title>toolbar_icon_grey</title>
- <desc>Created with Sketch.</desc>
- <g id="Snowflake-Extension" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <g id="Group-2" transform="translate(-268.000000, -68.000000)">
- <g id="toolbar_icon_grey" transform="translate(268.000000, 68.000000)">
- <circle id="container" fill="#FFFFFF" cx="32" cy="32" r="32"></circle>
- <path d="M57.1612903,31.1612903 L50.073914,31.1612903 C51.8578495,29.3958065 54.8087097,26.4717849 56.5333763,24.747957 C56.8610323,24.4203011 56.8610323,23.8891183 56.5336559,23.5614624 C56.206,23.234086 55.6753763,23.2343656 55.3474409,23.5611828 C53.1220645,25.786 48.844086,30.0192473 47.6891828,31.1612903 L34.0246452,31.1612903 L43.3715054,21.8144301 C43.8272043,21.8200215 44.2834624,21.8230968 44.7397204,21.8230968 C45.8635914,21.8230968 46.9852258,21.8091183 48.0803011,21.7951398 C50.1784731,21.7688602 52.3487742,21.7420215 54.5146022,21.8133118 C54.9837204,21.8247742 55.3653333,21.466086 55.3809892,21.0031183 C55.3963656,20.5401505 55.0334839,20.1523871 54.5702366,20.1370108 C52.365828,20.0637634 50.1767957,20.0911613 48.0590538,20.118 C47.0688172,20.1303011 46.0570538,20.1392473 45.044172,20.1417634 L50.3847957,14.8011398 C50.7124516,14.474043 50.7124516,13.9425806 50.3847957,13.6152043 C50.0574194,13.2875484 49.525957,13.2875484 49.1988602,13.6152043 L44.140
6022,18.6734624 C44.1534624,16.1469892 44.1713548,12.1401935 44.171914,9.76608602 C44.1721935,9.30283871 43.7964516,8.92737634 43.3334839,8.92709677 L43.3332043,8.92709677 C42.8702366,8.92709677 42.4947742,9.30255914 42.4944946,9.76580645 C42.4939355,12.7974624 42.4645806,18.4939785 42.4545161,20.3595484 L32.8387097,29.9753548 L32.8387097,16.5895484 C33.846,15.5713548 38.238043,11.1317849 40.5193333,8.84965591 C40.8469892,8.522 40.8469892,7.99109677 40.5193333,7.66372043 C40.1913978,7.33578495 39.6602151,7.33634409 39.3328387,7.66372043 C37.5824516,9.41494624 34.5946882,12.4306667 32.8387097,14.2045376 L32.8387097,6.83870968 C32.8387097,6.37546237 32.4632473,6 32,6 C31.5370323,6 31.1612903,6.37546237 31.1612903,6.83870968 L31.1612903,14.1651183 C30.5210753,13.5193118 29.8856129,12.8721075 29.2649677,12.2355269 C27.7863226,10.7191398 26.2573548,9.15131183 24.6467527,7.64443011 C24.3087527,7.32795699 23.778129,7.34501075 23.4613763,7.68356989 C23.1449032,8.02184946 23.1625161,8.552473
12 23.5007957,8.86922581 C25.0831613,10.3501075 26.5984301,11.9036774 28.0639355,13.4063656 C29.0692688,14.4371398 30.107871,15.4975484 31.1612903,16.5316774 L31.1612903,29.9753548 L22.0428387,20.8569032 C22.0383656,20.0411183 22.0000645,13.1734839 21.9997849,9.73477419 C21.9995054,9.27180645 21.6243226,8.89606452 21.1607957,8.89634409 C20.697828,8.89634409 20.322086,9.27208602 20.3223656,9.73505376 C20.3226452,12.2827742 20.3438925,16.7092043 20.3564731,19.1702581 L14.8011398,13.6152043 C14.474043,13.2875484 13.9425806,13.2875484 13.6152043,13.6152043 C13.2875484,13.9425806 13.2875484,14.474043 13.6152043,14.8011398 L18.923957,20.1098925 C18.0874839,20.1054194 17.2538065,20.0975914 16.4352258,20.0872473 C14.3174839,20.0604086 12.128172,20.0327312 9.92404301,20.1062581 C9.46107527,20.1216344 9.09819355,20.5091183 9.11356989,20.9723656 C9.12894624,21.4353333 9.51419355,21.7984946 9.97967742,21.7825591 C12.1452258,21.7109892 14.3155269,21.7381075 16.4142581,21.7643871 C17.5093333,21.7
78086 18.6306882,21.7920645 19.7545591,21.7920645 C20.0366452,21.7920645 20.3187312,21.7889892 20.6010968,21.7870323 L29.9753548,31.1612903 L16.7673548,31.1612903 C15.6124516,30.0192473 11.3344731,25.786 9.10909677,23.5611828 C8.78144086,23.2343656 8.25053763,23.234086 7.92316129,23.5614624 C7.59550538,23.8891183 7.59550538,24.4203011 7.92316129,24.747957 C9.64782796,26.4717849 12.5986882,29.3958065 14.3823441,31.1612903 L6.83870968,31.1612903 C6.37574194,31.1612903 6,31.5367527 6,32 C6,32.4632473 6.37574194,32.8387097 6.83870968,32.8387097 L14.5053548,32.8387097 C13.8327097,33.5068817 13.1572688,34.1697419 12.4932903,34.8172258 C10.9777419,36.2953118 9.41019355,37.824 7.90387097,39.4337634 C7.58739785,39.772043 7.60473118,40.3026667 7.94301075,40.6191398 C8.10488172,40.7703871 8.31064516,40.8455914 8.51612903,40.8455914 C8.74006452,40.8455914 8.96344086,40.756129 9.1283871,40.5797204 C10.6087097,38.997914 12.1622796,37.4832043 13.6644086,36.0182581 C14.7220215,34.9869247 15.8115054
,33.9206452 16.8713548,32.8387097 L29.9753548,32.8387097 L20.1733548,42.6407097 C18.734129,42.6292473 17.2884731,42.6451828 15.8853118,42.6633548 C13.7868602,42.6890753 11.6165591,42.7161935 9.45101075,42.6449032 C8.98776344,42.634 8.60027957,42.992129 8.58462366,43.4553763 C8.56924731,43.9183441 8.93212903,44.3061075 9.39537634,44.3212043 C11.5992258,44.3944516 13.7885376,44.3667742 15.9065591,44.3404946 C16.7578495,44.329871 17.625914,44.3217634 18.4962151,44.3178495 L13.6152043,49.1988602 C13.2875484,49.525957 13.2875484,50.0574194 13.6152043,50.3847957 C13.7790323,50.5486237 13.9937419,50.6305376 14.208172,50.6305376 C14.4228817,50.6305376 14.6375914,50.5486237 14.8011398,50.3847957 L19.8269677,45.3589677 C19.8143871,47.8381935 19.7939785,52.1793548 19.7936989,54.6924086 C19.7934194,55.1556559 20.1691613,55.5313978 20.632129,55.5313978 L20.6324086,55.5313978 C21.0953763,55.5313978 21.4708387,55.1559355 21.4711183,54.6929677 C21.4716774,51.3697204 21.5071828,44.844 21.5133333,43.
6726022 L31.1612903,34.0246452 L31.1612903,47.4683226 C30.1073118,48.5032903 29.0681505,49.5639785 28.0622581,50.5953118 C26.5973118,52.0974409 25.0826022,53.6504516 23.5007957,55.1307742 C23.1625161,55.4472473 23.1449032,55.9781505 23.4613763,56.3164301 C23.6266022,56.4925591 23.8499785,56.5820215 24.073914,56.5820215 C24.2793978,56.5820215 24.4851613,56.5068172 24.6467527,56.3555699 C26.2567957,54.8489677 27.7852043,53.2819785 29.2632903,51.7664301 C29.8847742,51.1292903 30.5207957,50.4812473 31.1612903,49.8351613 L31.1612903,57.1612903 C31.1612903,57.6245376 31.5370323,58 32,58 C32.4632473,58 32.8387097,57.6245376 32.8387097,57.1612903 L32.8387097,49.7954624 C34.5946882,51.5696129 37.5824516,54.5847742 39.3328387,56.3362796 C39.6604946,56.6636559 40.1913978,56.6639355 40.5193333,56.3365591 C40.8469892,56.0089032 40.8469892,55.478 40.5193333,55.1503441 C38.238043,52.8684946 33.846,48.4289247 32.8387097,47.4107312 L32.8387097,34.0246452 L42.2856559,43.4715914 C42.2929247,44.773828
42.3273118,51.1631183 42.327871,54.4388387 C42.3281505,54.902086 42.7036129,55.2775484 43.1668602,55.2775484 C43.6301075,55.2775484 44.0055699,54.9018065 44.0052903,54.4388387 C44.0050108,51.9433978 43.9848817,47.646129 43.9723011,45.157957 L49.1988602,50.3847957 C49.3624086,50.5486237 49.5771183,50.6305376 49.791828,50.6305376 C50.0062581,50.6305376 50.2212473,50.5486237 50.3847957,50.3847957 C50.7124516,50.0574194 50.7124516,49.525957 50.3847957,49.1988602 L45.2499355,44.0637204 C46.1378495,44.067914 47.0238065,44.0757419 47.8927097,44.0866452 C50.010172,44.1134839 52.1992043,44.1411613 54.4038925,44.0676344 C54.8668602,44.0522581 55.2297419,43.6647742 55.2143656,43.2015269 C55.1987097,42.7385591 54.8173763,42.3812688 54.3479785,42.3913333 C52.1821505,42.4626237 50.012129,42.4355054 47.9136774,42.4095054 C46.4937419,42.3916129 45.0301935,42.3751183 43.5733548,42.3874194 L34.0246452,32.8387097 L47.5851828,32.8387097 C48.6450323,33.9206452 49.7347957,34.9869247 50.792129,36.0182581
C52.2945376,37.4832043 53.8475484,38.997914 55.327871,40.5797204 C55.4930968,40.756129 55.7164731,40.8455914 55.9406882,40.8455914 C56.1458925,40.8455914 56.3516559,40.7703871 56.5135269,40.6191398 C56.8518065,40.3026667 56.8694194,39.772043 56.5526667,39.4337634 C55.0463441,37.824 53.4790753,36.2953118 51.9632473,34.8172258 C51.2992688,34.1697419 50.623828,33.5068817 49.9511828,32.8387097 L57.1612903,32.8387097 C57.6245376,32.8387097 58,32.4632473 58,32 C58,31.5367527 57.6245376,31.1612903 57.1612903,31.1612903" id="icon" stroke="#68B030" fill="#68B030" stroke-linecap="square" stroke-linejoin="bevel"></path>
- </g>
- </g>
- </g>
-</svg>
diff --git a/proxy/static/bootstrap.css b/proxy/static/bootstrap.css
deleted file mode 100644
index fa704df..0000000
--- a/proxy/static/bootstrap.css
+++ /dev/null
@@ -1,334 +0,0 @@
-/* This is a subset of bootstrap.css */
-.navbar-brand img {
- max-width: 4em; }
-
-.navbar {
-display: none; }
-
-.navbar {
- position: relative;
- display: flex;
- flex-wrap: wrap;
- align-items: center;
- justify-content: space-between;
- padding: 0.5rem 1rem; }
- .navbar > .container,
- .navbar > .container-fluid {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
- justify-content: space-between; }
-
-.navbar-brand {
- display: inline-block;
- padding-top: 0.3125rem;
- padding-bottom: 0.3125rem;
- margin-right: 1rem;
- font-size: 1.25rem;
- line-height: inherit;
- white-space: nowrap; }
- .navbar-brand:focus, .navbar-brand:hover {
- text-decoration: none; }
-
-.navbar-dark .navbar-brand {
- color: #FFFFFF; }
- .navbar-dark .navbar-brand:focus, .navbar-dark .navbar-brand:hover {
- color: #FFFFFF; }
-.navbar-dark .navbar-nav .nav-link {
- color: #FFFFFF; }
- .navbar-dark .navbar-nav .nav-link:focus, .navbar-dark .navbar-nav .nav-link:hover {
- color: rgba(255, 255, 255, 0.75); }
- .navbar-dark .navbar-nav .nav-link.disabled {
- color: rgba(255, 255, 255, 0.25); }
-.navbar-dark .navbar-nav .show > .nav-link,
-.navbar-dark .navbar-nav .active > .nav-link,
-.navbar-dark .navbar-nav .nav-link.show,
-.navbar-dark .navbar-nav .nav-link.active {
- color: #FFFFFF; }
-.navbar-dark .navbar-toggler {
- color: #FFFFFF;
- border-color: rgba(255, 255, 255, 0.1); }
-.navbar-dark .navbar-toggler-icon {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='%23FFFFFF' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"); }
-.navbar-dark .navbar-text {
- color: #FFFFFF; }
- .navbar-dark .navbar-text a {
- color: #FFFFFF; }
- .navbar-dark .navbar-text a:focus, .navbar-dark .navbar-text a:hover {
- color: #FFFFFF; }
-
-.navbar {
- background-image: url("./images/onion-bg.svg");
- background-repeat: no-repeat;
- background-position: 10px 12px; }
-
-.navbar-brand span {
- font-size: 0.6em;
- display: flex; }
-
-.no-gutters {
- margin-right: 0;
- margin-left: 0; }
- .no-gutters > .col,
- .no-gutters > [class*="col-"] {
- padding-right: 0;
- padding-left: 0; }
-
-.no-gutters {
- margin-bottom: 0 !important; }
-
-.no-background {
- background-image: none !important; }
-
-.bg-dark {
- background-color: #59316B !important; }
-
-a.bg-dark:focus, a.bg-dark:hover {
- background-color: #3c2148 !important; }
-
-.p-4 {
- padding: 1.5rem !important; }
-
-.btn-group,
-.btn-group-vertical {
- position: relative;
- display: inline-flex;
- vertical-align: middle; }
- .btn-group > .btn,
- .btn-group-vertical > .btn {
- position: relative;
- flex: 0 1 auto; }
- .btn-group > .btn:hover,
- .btn-group-vertical > .btn:hover {
- z-index: 2; }
- .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active,
- .btn-group-vertical > .btn:focus,
- .btn-group-vertical > .btn:active,
- .btn-group-vertical > .btn.active {
- z-index: 2; }
- .btn-group .btn + .btn,
- .btn-group .btn + .btn-group,
- .btn-group .btn-group + .btn,
- .btn-group .btn-group + .btn-group,
- .btn-group-vertical .btn + .btn,
- .btn-group-vertical .btn + .btn-group,
- .btn-group-vertical .btn-group + .btn,
- .btn-group-vertical .btn-group + .btn-group {
- margin-left: -1px; }
-
-.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
- border-radius: 0; }
-
-.btn-group > .btn:first-child {
- margin-left: 0; }
- .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0; }
-
-.btn-group > .btn:last-child:not(:first-child),
-.btn-group > .dropdown-toggle:not(:first-child) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0; }
-
-.btn-group > .btn-group {
- float: left; }
-
-.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
- border-radius: 0; }
-
-.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
-.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0; }
-
-.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0; }
-
-.dropup,
-.dropdown {
- position: relative; }
-
-.dropdown-toggle::after {
- display: inline-block;
- width: 0;
- height: 0;
- margin-left: 0.255em;
- vertical-align: 0.255em;
- content: "";
- border-top: 0.3em solid;
- border-right: 0.3em solid transparent;
- border-bottom: 0;
- border-left: 0.3em solid transparent; }
-.dropdown-toggle:empty::after {
- margin-left: 0; }
-
-.dropup .dropdown-toggle::after {
- display: inline-block;
- width: 0;
- height: 0;
- margin-left: 0.255em;
- vertical-align: 0.255em;
- content: "";
- border-top: 0;
- border-right: 0.3em solid transparent;
- border-bottom: 0.3em solid;
- border-left: 0.3em solid transparent; }
-.dropup .dropdown-toggle:empty::after {
- margin-left: 0; }
-
-.dropdown-menu {
- position: absolute;
- top: 100%;
- left: 0;
- z-index: 1000;
- display: none;
- float: left;
- min-width: 10rem;
- padding: 0.5rem 0;
- margin: 0.125rem 0 0;
- font-size: 1rem;
- color: #212529;
- text-align: left;
- list-style: none;
- background-color: #FFFFFF;
- background-clip: padding-box;
- border: 1px solid rgba(0, 0, 0, 0.15);
- border-radius: 0.25rem; }
-
-.dropup .dropdown-menu {
- margin-top: 0;
- margin-bottom: 0.125rem; }
-.dropup .dropdown-toggle::after {
- display: inline-block;
- width: 0;
- height: 0;
- margin-left: 0.255em;
- vertical-align: 0.255em;
- content: "";
- border-top: 0;
- border-right: 0.3em solid transparent;
- border-bottom: 0.3em solid;
- border-left: 0.3em solid transparent; }
-.dropup .dropdown-toggle:empty::after {
- margin-left: 0; }
-
-.dropdown-menu.show {
- display: block; }
-
-.dropdown-item {
- display: block;
- width: 100%;
- padding: 0.25rem 1.5rem;
- clear: both;
- font-weight: 400;
- color: #212529;
- text-align: inherit;
- white-space: nowrap;
- background: none;
- border: 0; }
- .dropdown-item:focus, .dropdown-item:hover {
- color: #16181b;
- text-decoration: none;
- background-color: #F8F9FA; }
- .dropdown-item.active, .dropdown-item:active {
- color: #FFFFFF;
- text-decoration: none;
- background-color: #7D4698; }
- .dropdown-item.disabled, .dropdown-item:disabled {
- color: #848E97;
- background-color: transparent; }
-
-.btn {
- display: inline-block;
- font-weight: 400;
- text-align: center;
- white-space: nowrap;
- vertical-align: middle;
- user-select: none;
- border: 1px solid transparent;
- padding: 0.375rem 0.75rem;
- font-size: 1rem;
- line-height: 1.5;
- border-radius: 0.25rem;
- transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; }
- .btn:focus, .btn:hover {
- text-decoration: none; }
- .btn:focus, .btn.focus {
- outline: 0;
- box-shadow: 0 0 0 0.2rem rgba(125, 70, 152, 0.25); }
- .btn.disabled, .btn:disabled {
- opacity: .65; }
- .btn:not([disabled]):not(.disabled):active, .btn:not([disabled]):not(.disabled).active {
- background-image: none; }
-
-a.btn.disabled,
-fieldset[disabled] a.btn {
- pointer-events: none; }
-
-.btn-dark {
- color: #fff;
- background-color: #59316B;
- border-color: #59316B; }
- .btn-dark:hover {
- color: #fff;
- background-color: #432551;
- border-color: #3c2148; }
- .btn-dark:focus, .btn-dark.focus {
- box-shadow: 0 0 0 0.2rem rgba(89, 49, 107, 0.5); }
- .btn-dark.disabled, .btn-dark:disabled {
- background-color: #59316B;
- border-color: #59316B; }
- .btn-dark:not([disabled]):not(.disabled):active, .btn-dark:not([disabled]):not(.disabled).active, .show > .btn-dark.dropdown-toggle {
- color: #fff;
- background-color: #3c2148;
- border-color: #351d3f;
- box-shadow: 0 0 0 0.2rem rgba(89, 49, 107, 0.5); }
-
-
-.btn-block {
- display: block;
- width: 100%; }
-
-.btn-block + .btn-block {
- margin-top: 0.5rem; }
-
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
- width: 100%; }
-
-*,
-*::before,
-*::after {
- box-sizing: border-box; }
-
-a,
-area,
-button,
-[role="button"],
-input:not([type="range"]),
-label,
-select,
-summary,
-textarea {
- touch-action: manipulation; }
-
-a {
- color: #7D4698;
- text-decoration: none;
- background-color: transparent;
- -webkit-text-decoration-skip: objects; }
- a:hover {
- color: #522e64;
- text-decoration: underline; }
-
-a:not([href]):not([tabindex]) {
- color: inherit;
- text-decoration: none; }
- a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
- color: inherit;
- text-decoration: none; }
- a:not([href]):not([tabindex]):focus {
- outline: 0; }
-
diff --git a/proxy/static/chrome150.jpg b/proxy/static/chrome150.jpg
deleted file mode 100644
index fc8a83f..0000000
Binary files a/proxy/static/chrome150.jpg and /dev/null differ
diff --git a/proxy/static/embed.css b/proxy/static/embed.css
deleted file mode 100644
index 162521a..0000000
--- a/proxy/static/embed.css
+++ /dev/null
@@ -1,150 +0,0 @@
-body {
- color: black;
- margin: 10px;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
- width: 300px;
- font-size: 12px;
-}
-
-#active {
- margin: 20px 0;
- text-align: center;
-}
-
-#statusimg {
- background-image: url("assets/status-off.svg");
- background-repeat: no-repeat;
- background-position: center center;
- min-height: 60px;
-}
-#statusimg.on {
- background-image: url("assets/status-on.svg");
-}
-#statusimg.on.running {
- background-image: url("assets/status-running.svg");
-}
-
-.b {
- border-top: 1px solid gainsboro;
- padding: 10px;
- position: relative;
-}
-
-.b a {
- color: inherit;
- display: inline-block;
- text-decoration: none;
-}
-
-.error {
- color: firebrick;
-}
-
-.learn:before {
- content : " ";
- display: block;
- position: absolute;
- top: 12px;
- background-image: url('assets/arrowhead-right-12.svg');
- width: 12px;
- height: 12px;
- opacity : 0.6;
- z-index: 9999;
- right: 0px;
- margin-right: 10px;
-}
-
-/* Snowflake Status */
-
-.transfering {
- -webkit-animation:spin 8s linear infinite;
- -moz-animation:spin 8s linear infinite;
- animation:spin 8s linear infinite;
- fill: BlueViolet;
-}
-@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
-@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
-@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
-
-/* Toggle */
-
-.switch {
- position: relative;
- display: inline-block;
- width: 30px;
- height: 17px;
- float: right;
-}
-
-.switch input {
- opacity: 0;
- width: 0;
- height: 0;
-}
-
-.slider {
- position: absolute;
- cursor: pointer;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background-color: #ccc;
- -webkit-transition: .4s;
- transition: .4s;
- border-radius: 17px;
-}
-
-.slider:before {
- position: absolute;
- content: "";
- height: 13px;
- width: 13px;
- left: 2px;
- bottom: 2px;
- background-color: white;
- -webkit-transition: .4s;
- transition: .4s;
- border-radius: 50%;
-}
-
-input:checked + .slider {
- background-color: BlueViolet;
-}
-
-input:focus + .slider {
- box-shadow: 0 0 1px BlueViolet;
-}
-
-input:checked + .slider:before {
- -webkit-transform: translateX(13px);
- -ms-transform: translateX(13px);
- transform: translateX(13px);
-}
-
-/* Dark Mode */
-@media (prefers-color-scheme: dark) {
- body {
- /* https://design.firefox.com/photon/visuals/color.html#dark-theme */
- color: white;
- background-color: #38383d;
- }
- #statusimg {
- background-image: url("assets/status-off-dark.svg");
- }
- #statusimg.on {
- background-image: url("assets/status-on-dark.svg");
- }
- #statusimg.on.running {
- background-image: url("assets/status-running.svg");
- }
- input:checked + .slider {
- background-color: #cc80ff;
- }
- input:focus + .slider {
- box-shadow: 0 0 1px #cc80ff;
- }
- .learn:before {
- background-image: url('assets/arrowhead-right-dark-12.svg');
- }
-}
diff --git a/proxy/static/embed.html b/proxy/static/embed.html
deleted file mode 100644
index b3ca800..0000000
--- a/proxy/static/embed.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <meta charset="utf-8" />
- <!-- This should be essentially be a no-opt in the popup -->
- <meta http-equiv="refresh" content="86400" />
- <title>Snowflake</title>
- <link rel="icon" id="icon" href="assets/toolbar-off.ico" />
- <link rel="stylesheet" href="embed.css" />
- <script src="popup.js"></script>
- <script src="embed.js"></script>
- </head>
- <body>
- <div id="active">
- <div id="statusimg"></div>
- <p id="statustext">__MSG_popupStatusOff__</p>
- <p id="statusdesc"></p>
- </div>
- <div class="b button">
- <label id="toggle" for="enabled">__MSG_popupEnabled__</label>
- <label class="switch">
- <input id="enabled" type="checkbox" />
- <span class="slider round"></span>
- </label>
- </div>
- <div class="b learn">
- <a target="_blank" href="https://snowflake.torproject.org/">__MSG_popupLearnMore__</a>
- </div>
- </body>
-</html>
diff --git a/proxy/static/firefox150.jpg b/proxy/static/firefox150.jpg
deleted file mode 100644
index 1eda543..0000000
Binary files a/proxy/static/firefox150.jpg and /dev/null differ
diff --git a/proxy/static/index.css b/proxy/static/index.css
deleted file mode 100644
index b23e1ad..0000000
--- a/proxy/static/index.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@font-face {
- font-family: Source Sans Pro;
- src: url("SourceSansPro-Regular.ttf");
-}
-
-body {
- margin: 0;
- font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
- font-size: 1.3rem;
- font-weight: 400;
- line-height: 1.5;
- color: #212529;
-}
-
-header {
- margin: 0;
- background-color: #59316B;
- padding: 0 5.2rem;
-}
-
-#content {
- max-width: 90rem;
- margin: 0 auto 2.6rem auto;
- padding: 2.6rem 5.2rem;
- background-color: #FFFFFF;
-}
-
-@media only screen and (max-width: 600px) {
- #content {
- padding: 2.6rem 1.3rem;
- }
-}
-
-section {
- margin: 1.3rem 0;
-}
-
-h1 {
- margin: 0;
- font-size: 2.6rem;
- color: #7D4698;
- text-align: center;
-}
-
-h2 {
- margin: 0;
- font-size: 2rem;
- color: #7D4698;
-}
-
-.sidebyside {
- display: flex;
- flex-flow: row wrap;
- align-items: flex-start;
-}
-
-.sidebyside section {
- flex: 1 1 15rem;
- padding: 0 1.3rem;
-}
-
-.addon {
- margin-top: 2.6rem 0;
- text-align: center;
-}
-
-.addon a {
- display: inline-block;
- padding: 0 1.3rem;
-}
-
-.diagram, .screenshot {
- padding: 2.6rem 5.2rem;
- text-align: center;
-}
-
-.diagram img, .screenshot img {
- max-width: 100%;
-}
-
-textarea {
- max-width: 100%;
- width: 600px;
-}
-
-.dropdown:hover .dropdown-menu {
- display: block;
- height: 350px;
- overflow: auto;
-}
-
-.pull-right {
- float: right !important;
-}
diff --git a/proxy/static/index.html b/proxy/static/index.html
deleted file mode 100644
index 32cdcde..0000000
--- a/proxy/static/index.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1" />
- <title>Snowflake</title>
- <link rel="icon" href="./assets/favicon.ico" />
- <link rel="stylesheet" href="./bootstrap.css" />
- <link rel="stylesheet" href="./index.css" />
- </head>
- <body class="no-gutters">
- <header id="header">
-
- <nav class="navbar no-background navbar-dark bg-dark p-4">
-
- <a class="navbar-brand" href="https://www.torproject.org/">
- <img src="./tor-logo(a)2x.png" alt="Tor" height="50" />
- </a>
-
- <div class="btn-group dropdown pull-right">
-
- <button id="language-switcher" type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- </button>
- <div id="supported-languages" class="dropdown-menu">
- </div>
- </div>
- </nav>
- </header>
- <div>
- <section id="content">
- <h1>SNOWFLAKE</h1>
-
- <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/…" alt="Diagram" /></p>
-
- <p data-msgid="__MSG_websiteIntro__">Snowflake is a system to defeat internet censorship. People who are
- censored can use Snowflake to access the internet. Their connection goes
- through Snowflake proxies, which are run by volunteers. For more detailed
- information about how Snowflake works see our
- <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/" data-msgid="__MSG_docWiki__">documentation wiki</a>.</p>
-
- <div class="sidebyside">
-
- <section id="browser" class="browser">
- <h2 data-msgid="__MSG_browser__">Browser</h2>
-
- <p data-msgid="__MSG_censoredUsers__">If your internet access is censored, you should download
- <a href="https://www.torproject.org/download/">Tor Browser</a>.</p>
-
- <p class="screenshot"><img src="./screenshot.png" alt="Tor Browser screenshot" /></p>
- </section>
-
- <section id="extension" class="extension">
- <h2 data-msgid="__MSG_extension__">Extension</h2>
-
- <p data-msgid="__MSG_installExtension__">If your internet access is <strong>not</strong> censored, you should
- consider installing the Snowflake extension to help users in censored
- networks. There is no need to worry about which websites people are
- accessing through your proxy. Their visible browsing IP address will
- match their Tor exit node, not yours.</p>
-
- <p class="addon">
- <a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/">
- <img src="./firefox150.jpg" alt="Install in Firefox" height="100" /><br />
- <span data-msgid="MSG_installFirefox__">Install in Firefox</span>
- </a>
- <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…">
- <img src="./chrome150.jpg" alt="Install in Chrome" height="100" /><br />
- <span data-msgid="__MSG_installChrome__">Install in Chrome</span>
- </a>
- </p>
- </section>
-
- </div>
-
- <section id="bugs">
- <h2 data-msgid="__MSG_reportingBugs__">Reporting Bugs</h2>
-
- <p data-msgid="__MSG_fileBug__">If you encounter problems with Snowflake as a client or a proxy,
- please consider filing a bug. To do so, you will have to,</p>
-
- <ol>
- <li data-msgid="__MSG_sharedAccount__">
- Either <a href="https://trac.torproject.org/projects/tor/register">create an
- account</a> or <a href="https://trac.torproject.org/projects/tor/login">log in</a>
- using the shared <b>cypherpunks</b> account with password <b>writecode</b>.</li>
- <li data-msgid="__MSG_bugTracker__">
- <a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a>
- using our bug tracker.</li>
- </ol>
-
- <p data-msgid="__MSG_descriptive__">
- Please try to be as descriptive as possible with your ticket and if
- possible include log messages that will help us reproduce the bug.
- Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em>
- to let us know how which part of the Snowflake system is experiencing
- problems.
- </p>
- </section>
-
- <section id="embed">
- <h2 data-msgid="__MSG_embed__">Embed</h2>
-
- <p data-msgid="__MSG_possible__">It is now possible to embed the Snowflake badge on any website:</p>
-
- <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe></textarea>
-
- <p data-msgid="__MSG_looksLike__">Which looks like this:</p>
-
- <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
- </section>
-
- </section>
- </div>
- <script src="index.js"></script>
- </body>
-</html>
diff --git a/proxy/static/index.js b/proxy/static/index.js
deleted file mode 100644
index 80a3aeb..0000000
--- a/proxy/static/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/* global availableLangs */
-
-class Messages {
- constructor(json) {
- this.json = json;
- }
- getMessage(m, ...rest) {
- if (Object.prototype.hasOwnProperty.call(this.json, m)) {
- let message = this.json[m].message;
- return message.replace(/\$(\d+)/g, (...args) => {
- return rest[Number(args[1]) - 1];
- });
- }
- }
-}
-
-
-var defaultLang = "en_US";
-
-var getLang = function() {
- let lang = navigator.language || defaultLang;
- lang = lang.replace(/-/g, '_');
-
- //prioritize override language
- var url_string = window.location.href; //window.location.href
- var url = new URL(url_string);
- var override_lang = url.searchParams.get("lang");
- if (override_lang != null) {
- lang = override_lang;
- }
-
- if (Object.prototype.hasOwnProperty.call(availableLangs, lang)) {
- return lang;
- }
- lang = lang.split('_')[0];
- if (Object.prototype.hasOwnProperty.call(availableLangs, lang)) {
- return lang;
- }
- return defaultLang;
-}
-
-var fill = function(n, func) {
- switch(n.nodeType) {
- case 1: // Node.ELEMENT_NODE
- {
- const m = /^__MSG_([^_]*)__$/.exec(n.dataset.msgid);
- if (m) {
- var val = func(m[1]);
- if (val != undefined) {
- n.innerHTML = val
- }
- }
- n.childNodes.forEach(c => fill(c, func));
- break;
- }
- }
-}
-
-
-fetch(`./_locales/${getLang()}/messages.json`)
-.then((res) => {
- if (!res.ok) { return; }
- return res.json();
-})
-.then((json) => {
- var language = document.getElementById('language-switcher');
- var lang = `${getLang()}`
- language.innerText = availableLangs[lang].name + ' (' + lang + ')';
- var messages = new Messages(json);
- fill(document.body, (m) => {
- return messages.getMessage(m);
- });
-});
-
-// Populate language switcher list
-for (var lang in availableLangs) {
- var languageList = document.getElementById('supported-languages');
- var link = document.createElement('a');
- link.setAttribute('href', '?lang='+lang);
- link.setAttribute('class', "dropdown-item");
- link.innerText = availableLangs[lang].name + ' (' + lang + ')';
- languageList.lastChild.after(link);
-}
diff --git a/proxy/static/popup.js b/proxy/static/popup.js
deleted file mode 100644
index 80cbcc6..0000000
--- a/proxy/static/popup.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* exported Popup */
-
-// Add or remove a class from elem.classList, depending on cond.
-function setClass(elem, className, cond) {
- if (cond) {
- elem.classList.add(className);
- } else {
- elem.classList.remove(className);
- }
-}
-
-class Popup {
- constructor() {
- this.div = document.getElementById('active');
- this.statustext = document.getElementById('statustext');
- this.statusdesc = document.getElementById('statusdesc');
- this.img = document.getElementById('statusimg');
- }
- setEnabled(enabled) {
- setClass(this.img, 'on', enabled);
- }
- setActive(active) {
- setClass(this.img, 'running', active);
- }
- setStatusText(txt) {
- this.statustext.innerText = txt;
- }
- setStatusDesc(desc, error) {
- this.statusdesc.innerText = desc;
- setClass(this.statusdesc, 'error', error);
- }
- hideButton() {
- document.querySelector('.button').style.display = 'none';
- }
- setChecked(checked) {
- document.getElementById('enabled').checked = checked;
- }
- static fill(n, func) {
- switch(n.nodeType) {
- case 3: { // Node.TEXT_NODE
- const m = /^__MSG_([^_]*)__$/.exec(n.nodeValue);
- if (m) { n.nodeValue = func(m[1]); }
- break;
- }
- case 1: // Node.ELEMENT_NODE
- n.childNodes.forEach(c => Popup.fill(c, func));
- break;
- }
- }
-}
diff --git a/proxy/static/screenshot.png b/proxy/static/screenshot.png
deleted file mode 100644
index 58c0540..0000000
Binary files a/proxy/static/screenshot.png and /dev/null differ
diff --git a/proxy/static/tor-logo(a)2x.png b/proxy/static/tor-logo(a)2x.png
deleted file mode 100644
index 5a459de..0000000
Binary files a/proxy/static/tor-logo(a)2x.png and /dev/null differ
diff --git a/proxy/ui.js b/proxy/ui.js
deleted file mode 100644
index f667bef..0000000
--- a/proxy/ui.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-All of Snowflake's DOM manipulation and inputs.
-*/
-
-class UI {
-
- setStatus() {}
-
- setActive(connected) {
- return this.active = connected;
- }
-
- log() {}
-
-}
-
-UI.prototype.active = false;
diff --git a/proxy/util.js b/proxy/util.js
deleted file mode 100644
index 42843d7..0000000
--- a/proxy/util.js
+++ /dev/null
@@ -1,216 +0,0 @@
-/* exported Util, Params, DummyRateLimit */
-
-/*
-A JavaScript WebRTC snowflake proxy
-
-Contains helpers for parsing query strings and other utilities.
-*/
-
-class Util {
-
- static genSnowflakeID() {
- return Math.random().toString(36).substring(2);
- }
-
- static hasWebRTC() {
- return typeof PeerConnection === 'function';
- }
-
- static hasCookies() {
- return navigator.cookieEnabled;
- }
-
-}
-
-
-class Parse {
-
- // Parse a cookie data string (usually document.cookie). The return type is an
- // object mapping cookies names to values. Returns null on error.
- // http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038
- static cookie(cookies) {
- var i, j, len, name, result, string, strings, value;
- result = {};
- strings = [];
- if (cookies) {
- strings = cookies.split(';');
- }
- for (i = 0, len = strings.length; i < len; i++) {
- string = strings[i];
- j = string.indexOf('=');
- if (-1 === j) {
- return null;
- }
- name = decodeURIComponent(string.substr(0, j).trim());
- value = decodeURIComponent(string.substr(j + 1).trim());
- if (!(name in result)) {
- result[name] = value;
- }
- }
- return result;
- }
-
- // Parse an address in the form 'host:port'. Returns an Object with keys 'host'
- // (String) and 'port' (int). Returns null on error.
- static address(spec) {
- var host, m, port;
- m = null;
- if (!m) {
- // IPv6 syntax.
- m = spec.match(/^\[([\0-9a-fA-F:.]+)\]:([0-9]+)$/);
- }
- if (!m) {
- // IPv4 syntax.
- m = spec.match(/^([0-9.]+):([0-9]+)$/);
- }
- if (!m) {
- // TODO: Domain match
- return null;
- }
- host = m[1];
- port = parseInt(m[2], 10);
- if (isNaN(port) || port < 0 || port > 65535) {
- return null;
- }
- return {
- host: host,
- port: port
- };
- }
-
- // Parse a count of bytes. A suffix of 'k', 'm', or 'g' (or uppercase)
- // does what you would think. Returns null on error.
- static byteCount(spec) {
- let matches = spec.match(/^(\d+(?:\.\d*)?)(\w*)$/);
- if (matches === null) {
- return null;
- }
- let count = Number(matches[1]);
- if (isNaN(count)) {
- return null;
- }
- const UNITS = new Map([
- ['', 1],
- ['k', 1024],
- ['m', 1024*1024],
- ['g', 1024*1024*1024],
- ]);
- let unit = matches[2].toLowerCase();
- if (!UNITS.has(unit)) {
- return null;
- }
- let multiplier = UNITS.get(unit);
- return count * multiplier;
- }
-
- // Parse a connection-address out of the "c=" Connection Data field of a
- // session description. Return undefined if none is found.
- // https://tools.ietf.org/html/rfc4566#section-5.7
- static ipFromSDP(sdp) {
- var i, len, m, pattern, ref;
- ref = [/^c=IN IP4 ([\d.]+)(?:(?:\/\d+)?\/\d+)?(:? |$)/m, /^c=IN IP6 ([0-9A-Fa-f:.]+)(?:\/\d+)?(:? |$)/m];
- for (i = 0, len = ref.length; i < len; i++) {
- pattern = ref[i];
- m = pattern.exec(sdp);
- if (m != null) {
- return m[1];
- }
- }
- }
-
-}
-
-
-class Params {
-
- static getBool(query, param, defaultValue) {
- if (!query.has(param)) {
- return defaultValue;
- }
- var val;
- val = query.get(param);
- if ('true' === val || '1' === val || '' === val) {
- return true;
- }
- if ('false' === val || '0' === val) {
- return false;
- }
- return null;
- }
-
- // Get an object value and parse it as a byte count. Example byte counts are
- // '100' and '1.3m'. Returns |defaultValue| if param is not a key. Return null
- // on a parsing error.
- static getByteCount(query, param, defaultValue) {
- if (!query.has(param)) {
- return defaultValue;
- }
- return Parse.byteCount(query.get(param));
- }
-
-}
-
-
-class BucketRateLimit {
-
- constructor(capacity, time) {
- this.capacity = capacity;
- this.time = time;
- }
-
- age() {
- var delta, now;
- now = new Date();
- delta = (now - this.lastUpdate) / 1000.0;
- this.lastUpdate = now;
- this.amount -= delta * this.capacity / this.time;
- if (this.amount < 0.0) {
- return this.amount = 0.0;
- }
- }
-
- update(n) {
- this.age();
- this.amount += n;
- return this.amount <= this.capacity;
- }
-
- // How many seconds in the future will the limit expire?
- when() {
- this.age();
- return (this.amount - this.capacity) / (this.capacity / this.time);
- }
-
- isLimited() {
- this.age();
- return this.amount > this.capacity;
- }
-
-}
-
-BucketRateLimit.prototype.amount = 0.0;
-
-BucketRateLimit.prototype.lastUpdate = new Date();
-
-
-// A rate limiter that never limits.
-class DummyRateLimit {
-
- constructor(capacity, time) {
- this.capacity = capacity;
- this.time = time;
- }
-
- update() {
- return true;
- }
-
- when() {
- return 0.0;
- }
-
- isLimited() {
- return false;
- }
-
-}
diff --git a/proxy/webext/embed.js b/proxy/webext/embed.js
deleted file mode 100644
index eae482f..0000000
--- a/proxy/webext/embed.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* global chrome, Popup */
-
-// Fill i18n in HTML
-window.onload = () => {
- Popup.fill(document.body, (m) => {
- return chrome.i18n.getMessage(m);
- });
-};
-
-const port = chrome.runtime.connect({
- name: "popup"
-});
-
-port.onMessage.addListener((m) => {
- const { active, enabled, total, missingFeature } = m;
- const popup = new Popup();
-
- if (missingFeature) {
- popup.setEnabled(false);
- popup.setActive(false);
- popup.setStatusText(chrome.i18n.getMessage('popupStatusOff'));
- popup.setStatusDesc(chrome.i18n.getMessage(missingFeature), true);
- popup.hideButton();
- return;
- }
-
- const clients = active ? 1 : 0;
-
- if (enabled) {
- popup.setChecked(true);
- if (clients > 0) {
- popup.setStatusText(chrome.i18n.getMessage('popupStatusOn', String(clients)));
- } else {
- popup.setStatusText(chrome.i18n.getMessage('popupStatusReady'));
- }
- popup.setStatusDesc((total > 0) ? chrome.i18n.getMessage('popupDescOn', String(total)) : '');
- } else {
- popup.setChecked(false);
- popup.setStatusText(chrome.i18n.getMessage('popupStatusOff'));
- popup.setStatusDesc("");
- }
- popup.setEnabled(enabled);
- popup.setActive(active);
-});
-
-document.addEventListener('change', (event) => {
- port.postMessage({ enabled: event.target.checked });
-})
diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json
deleted file mode 100644
index c3ccfa7..0000000
--- a/proxy/webext/manifest.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "manifest_version": 2,
- "name": "Snowflake",
- "version": "0.2.2",
- "description": "__MSG_appDesc__",
- "default_locale": "en_US",
- "background": {
- "scripts": [
- "snowflake.js"
- ],
- "persistent": true
- },
- "browser_action": {
- "default_icon": {
- "48": "assets/toolbar-on-48.png",
- "96": "assets/toolbar-on-96.png"
- },
- "default_title": "Snowflake",
- "default_popup": "embed.html"
- },
- "permissions": [
- "storage"
- ]
-}
\ No newline at end of file
diff --git a/proxy/websocket.js b/proxy/websocket.js
deleted file mode 100644
index da7ba94..0000000
--- a/proxy/websocket.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Only websocket-specific stuff.
-*/
-
-class WS {
-
- // Build an escaped URL string from unescaped components. Only scheme and host
- // are required. See RFC 3986, section 3.
- static buildUrl(scheme, host, port, path, params) {
- var parts;
- parts = [];
- parts.push(encodeURIComponent(scheme));
- parts.push('://');
- // If it contains a colon but no square brackets, treat it as IPv6.
- if (host.match(/:/) && !host.match(/[[\]]/)) {
- parts.push('[');
- parts.push(host);
- parts.push(']');
- } else {
- parts.push(encodeURIComponent(host));
- }
- if (void 0 !== port && this.DEFAULT_PORTS[scheme] !== port) {
- parts.push(':');
- parts.push(encodeURIComponent(port.toString()));
- }
- if (void 0 !== path && '' !== path) {
- if (!path.match(/^\//)) {
- path = '/' + path;
- }
- path = path.replace(/[^/]+/, function(m) {
- return encodeURIComponent(m);
- });
- parts.push(path);
- }
- if (void 0 !== params) {
- parts.push('?');
- parts.push(new URLSearchParams(params).toString());
- }
- return parts.join('');
- }
-
- static makeWebsocket(addr, params) {
- var url, ws, wsProtocol;
- wsProtocol = this.WSS_ENABLED ? 'wss' : 'ws';
- url = this.buildUrl(wsProtocol, addr.host, addr.port, '/', params);
- ws = new WebSocket(url);
- /*
- 'User agents can use this as a hint for how to handle incoming binary data:
- if the attribute is set to 'blob', it is safe to spool it to disk, and if it
- is set to 'arraybuffer', it is likely more efficient to keep the data in
- memory.'
- */
- ws.binaryType = 'arraybuffer';
- return ws;
- }
-
- static probeWebsocket(addr) {
- return new Promise((resolve, reject) => {
- const ws = WS.makeWebsocket(addr);
- ws.onopen = () => {
- resolve();
- ws.close();
- };
- ws.onerror = () => {
- reject();
- ws.close();
- };
- });
- }
-
-}
-
-WS.WSS_ENABLED = true;
-
-WS.DEFAULT_PORTS = {
- http: 80,
- https: 443
-};
1
0
22 Apr '20
commit 3ff04c3c65bef4f10ed33c037f77a95c3e550b78
Author: Cecylia Bocovich <cohosh(a)torproject.org>
Date: Thu Mar 19 12:59:49 2020 -0400
Update .travis.yml for proxy/ code removal
---
.travis.yml | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 56d612c..941df43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,32 +4,10 @@ dist: xenial
go_import_path: git.torproject.org/pluggable-transports/snowflake.git
-addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - g++-5
- - gcc-5
-
go:
- 1.13.x
-env:
- - TRAVIS_NODE_VERSION="8" CC="gcc-5" CXX="g++-5"
-
-before_install:
- - nvm install $TRAVIS_NODE_VERSION
-
-install:
- - pushd proxy
- - npm install
- - popd
-
script:
- test -z "$(go fmt ./...)"
- go vet ./...
- go test -v -race ./...
- - cd proxy
- - npm run lint
- - npm test
1
0
commit e9b218a65cf731d0cf50a8655602ea82e67c128e
Author: Cecylia Bocovich <cohosh(a)torproject.org>
Date: Wed Apr 22 11:09:32 2020 -0400
Clean up .gitignore
---
.gitignore | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2d31939..9f36c7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,20 +6,7 @@
datadir/
broker/broker
client/client
-server-webrtc/server-webrtc
server/server
-proxy-go/proxy-go
+proxy/proxy
snowflake.log
-proxy/test
-proxy/build
-proxy/node_modules
-proxy/snowflake-library.js
-proxy/spec/support
-proxy/webext/snowflake.js
-proxy/webext/popup.js
-proxy/webext/embed.html
-proxy/webext/embed.css
-proxy/webext/assets/
-proxy/webext/_locales/
ignore/
-npm-debug.log
1
0
[community/master] Create page to list relay-associations. Will fix #63
by gus@torproject.org 22 Apr '20
by gus@torproject.org 22 Apr '20
22 Apr '20
commit 8be6e8d76b1f4a6717053e682523db5464d08efc
Author: Pili Guerra <pili(a)piliguerra.com>
Date: Wed Mar 25 19:00:27 2020 +0000
Create page to list relay-associations. Will fix #63
---
.../relay-associations/contents.lr | 19 +++
databags/relay-associations.ini | 149 +++++++++++++++++++++
templates/relay-associations.html | 35 +++++
3 files changed, 203 insertions(+)
diff --git a/content/relay-operations/community-resources/relay-associations/contents.lr b/content/relay-operations/community-resources/relay-associations/contents.lr
new file mode 100644
index 0000000..28cc246
--- /dev/null
+++ b/content/relay-operations/community-resources/relay-associations/contents.lr
@@ -0,0 +1,19 @@
+_model: page
+---
+color: primary
+---
+title: Relay Associations
+---
+html: relay-associations.html
+---
+key: 6
+---
+section: Community Resources
+---
+section_id: community-resources
+---
+subtitle: Here is a list of currently active relay associations.
+---
+body:
+
+Please let us know if you would like your relay association to be listed on this page.
\ No newline at end of file
diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini
new file mode 100644
index 0000000..3979727
--- /dev/null
+++ b/databags/relay-associations.ini
@@ -0,0 +1,149 @@
+[zwiebelfreunde]
+link =
+image =
+label = Zwiebelfreunde e.V.
+country = Germany
+contact =
+active = True
+display = True
+donate =
+
+[nosoignons]
+link = https://nos-oignons.net/
+image =
+label = Nos-oignons
+country = France
+contact = contact at nos-oignons.net
+active = True
+display =
+donate =
+
+[enn]
+link = https://enn.lu/
+image =
+label = Frënn vun der Ënn A.S.B.L.
+country = Luxembourg
+contact = info(a)enn.lu
+active = True
+display =
+donate =
+
+[hartvoorinternetvrijheid]
+link = https://www.hartvoorinternetvrijheid.nl/
+image =
+label = Hart voor Internetvrijheid
+country = Netherlands
+contact = bestuur(a)hartvoorinternetvrijheid.nl
+active = True
+display =
+donate =
+
+[saveyourprivacy]
+link = https://saveyourprivacy.net
+image =
+label = SaveYourPrivacy e.V.
+country = Germany
+contact = info(a)saveyourprivacy.net
+active = True
+display =
+donate =
+
+[coldhak]
+link = https://coldhak.ca/relays/
+image =
+label = Coldhak
+country = Canada
+contact = https://coldhak.ca/about/
+active = True
+display =
+donate =
+
+[appliedprivacy]
+link = https://appliedprivacy.net/
+image =
+label = Foundation for Applied Privacy
+country = Austria
+contact = tor(a)appliedprivacy.net
+active = True
+display =
+donate =
+
+[dfri]
+link = https://www.dfri.se/
+image =
+label = Föreningen för Digitala Fri- och Rättigheter
+country = Sweden
+contact = dfri(a)dfri.se
+active = True
+display =
+donate =
+
+[calyxinstitute]
+link = https://www.calyxinstitute.org
+image =
+label = The Calyx Institute
+country = US
+contact = nick(a)calyx.com
+active = True
+display =
+donate =
+
+[noisetor]
+link = https://noisetor.net
+image =
+label = NoiseTor
+country = US
+contact =
+active =
+display =
+donate =
+
+[icetor]
+link = https://icetor.is/
+image =
+label = Icetor
+country = Iceland
+contact = admin <AT> icetor <dot> is
+active =
+display =
+donate =
+
+[privacyfoundation]
+link = https://www.privacyfoundation.ch/
+image =
+label = Swiss Privacy Foundation
+country = Switzerland
+contact = office(a)privacyfoundation.ch
+active =
+display =
+donate =
+
+[digitalcourage]
+link = https://digitalcourage.de/support/tor
+image =
+label = Digital Courage
+country = Germany
+contact =
+active = True
+display =
+donate =
+
+[accessnow]
+link = https://accessnow.net
+image =
+label = Access Now
+country = US
+contact =
+active = True
+display =
+donate =
+
+[brasshorncommunications]
+link = https://brasshorncommunications.uk/projects/tor/
+image =
+label = BrassHorn Communications
+country = UK
+contact = hello(a)brasshorncommunications.uk
+active = True
+display =
+donate =
\ No newline at end of file
diff --git a/templates/relay-associations.html b/templates/relay-associations.html
new file mode 100644
index 0000000..10448d8
--- /dev/null
+++ b/templates/relay-associations.html
@@ -0,0 +1,35 @@
+<div class="row pt-5">
+ {% include 'sidenav.html' %}
+ <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}">
+ {{ this.body }}
+ <div class="container py-3">
+ <div class="row">
+ <table class="table">
+ <thead>
+ <tr>
+ <th scope="col">Organization Name</th>
+ <th scope="col">Country</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for id, item in bag('relay-associations').items() %}
+ {% if item.active == 'True' %}
+ <tr>
+ <td>
+ {% if item.link|length %}
+ <a href="{{ item.link }}">{{ item.label }}</a>
+ {% else %}
+ {{ item.label }}
+ {% endif %}
+ </td>
+
+ <td>{{ item.country }}</td>
+ </tr>
+ {% endif %}
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
1
0
commit 82a1952ec4c242ae8de2accb508b3312cea07b3f
Merge: cd10fed 8be6e8d
Author: gus <gus(a)torproject.org>
Date: Wed Apr 22 16:12:10 2020 -0400
Merge branch 'relay-associations'
.../relay-associations/contents.lr | 19 +++
databags/relay-associations.ini | 149 +++++++++++++++++++++
templates/relay-associations.html | 35 +++++
3 files changed, 203 insertions(+)
1
0
[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation@torproject.org 22 Apr '20
by translation@torproject.org 22 Apr '20
22 Apr '20
commit 6b0b80fad9b9fe7b7bc905d9b9c0d242e718ce1e
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Apr 22 19:53:28 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
contents+fa.po | 39 +++++++++++++++++++++++++++++++++++++--
1 file changed, 37 insertions(+), 2 deletions(-)
diff --git a/contents+fa.po b/contents+fa.po
index 5df59580fa..120fe30be0 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -2444,6 +2444,8 @@ msgid ""
"Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime,"
" and others: they can be manipulated into revealing your IP address."
msgstr ""
+"مرورگر تور افزونه های مرورگر مانند فلش، ریئل پلیر، کوئیکتایم، غیره را مسدود"
+" خواهد کرد: این ها میتوانند باعث آشکار شدن نشانی IP شما شوند."
#: https//support.torproject.org/faq/staying-anonymous/
#: (content/faq/staying-anonymous/contents+en.lrquestion.description)
@@ -2590,6 +2592,9 @@ msgid ""
" [bridge](https://tb-manual.torproject.org/bridges/) rather than connecting "
"directly to the Tor network."
msgstr ""
+"اگر این برای شما حائز اهمیت است، میتوانید این خطر را با پیکربندی تور در "
+"استفاده از یک [پل](https://tb-manual.torproject.org/bridges/) به جای اتصال "
+"مستقیم به شبکه تور کاهش دهید."
#: https//support.torproject.org/faq/staying-anonymous/
#: (content/faq/staying-anonymous/contents+en.lrquestion.description)
@@ -2598,6 +2603,9 @@ msgid ""
"there are near you and the more diverse their interests, the less dangerous "
"it will be that you are one of them."
msgstr ""
+"در نهایت بهترین محافظت یک رویکرد اجتماعی می باشد: هرچند کاربران تور بیشتری "
+"در نزدیک شما باشند و علایق آن ها متنوع تر باشد، خطر اینکه شما یکی از آن ها "
+"باشید کمتر است."
#: https//support.torproject.org/faq/staying-anonymous/
#: (content/faq/staying-anonymous/contents+en.lrquestion.description)
@@ -2620,6 +2628,8 @@ msgid ""
"This list of pitfalls isn't complete, and we need your help [identifying and"
" documenting all the issues](https://community.torproject.org/)."
msgstr ""
+"فهرست مشکلات کامل نیست، ما به کمک شما در [شناسایی و مستندسازی "
+"مشکلات](https://community.torproject.org/) نیاز داریم."
#: https//support.torproject.org/about/backdoor/
#: (content/about/backdoor/contents+en.lrquestion.title)
@@ -3582,6 +3592,9 @@ msgid ""
" import the key using the **Workaround (using a public key)** section "
"instead."
msgstr ""
+"اگر پیام خطایی دریافت کردید، اشتباهی رخ داده است و قبل از شناسایی مشکل نمی "
+"توانید ادامه دهید. ممکن است قادر به درون برد کلید با استفاده از بخش **دور "
+"زدن(با استفاده از یک کلید عمومی)** باشید."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3642,6 +3655,9 @@ msgid ""
" you will have downloaded a different version than 9.0 and you may not have "
"chosen the English (en-US) version."
msgstr ""
+"توجه داشته باشید که این دستورات از نام هایی استفاده می کنند که نمونه می باشد"
+" و با نام فایل شما تفاوت دارد: شما یک نسخه متفاوت از 9.0 را دریافت کرده اید "
+"و شاید نسخه انگلیسی (en-US) را انتخاب نکرده باشید."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3709,6 +3725,9 @@ msgid ""
"something went wrong with one of the previous steps, or you forgot that "
"these commands use example file names and yours will be a little different."
msgstr ""
+"اگر پیام خطایی دریافت کردید که می گفت 'هیچ فایل یا دایرکتوری وجود ندارد'، "
+"خطایی در یکی از مراحل گذشته رخ داده، یا شما فراموش کردید که اسامی فایل ها "
+"نمونه بودند و نام فایل های شما متفاوت است."
#: https//support.torproject.org/tbb/how-to-verify-signature/
#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -3792,6 +3811,12 @@ msgid ""
"2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
"fingerprinting-technique-called-letterboxing/)."
msgstr ""
+"مرورگر تور 9 همراه با یک مکانسیم دفاع در برابر انگشت نگاری برای چنین شرایطی "
+"نیز می آید، که به آن "
+"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming)) گفته می"
+" شود، یک روش که توسط تیم موزیلا طراحی شده و [در سال 2019 معرفی "
+"شد](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-"
+"fingerprinting-technique-called-letterboxing/)."
#: https//support.torproject.org/tbb/maximized-torbrowser-window/
#: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description)
@@ -10444,6 +10469,8 @@ msgid ""
"`lsb_release -c` or `cat /etc/debian_version` to check the Operating System "
"version."
msgstr ""
+"نام سیستم عامل خود را با `<DISTRIBUTION>` جایگزین کنید. `lsb_release -c` یا"
+" `cat /etc/debian_version` را برای بررسی نسخه سیستم عامل اجرا کنید."
#: https//support.torproject.org/apt/tor-deb-repo/
#: (content/apt/apt-1/contents+en.lrquestion.description)
@@ -11360,6 +11387,10 @@ msgid ""
"complaints,\" so we hope our network is more sustainable than past attempts "
"at anonymity networks."
msgstr ""
+"سیاست های خروجی تور به جداسازی نقش \"تمایل به اهدا منابع به شبکه\" از نقش "
+"\"تمایل به سر و کار داشتن با شکایت های سو استفاده رله خروج\" کمک می کنند، "
+"بنابراین ما امیدواریم که شبکه ما از تلاش های انجام شده در گذشته برای شبکه "
+"های ناشناس پایدار تر باشد."
#: https//support.torproject.org/abuse/does-tor-get-much-abuse/
#: (content/abuse/how-much-abuse/contents+en.lrquestion.description)
@@ -11661,6 +11692,10 @@ msgid ""
" are evil — they attempt to strong-arm network administrators on policy, "
"service, and routing issues, and then extract ransoms from victims."
msgstr ""
+"هرچند [تور برای اسپم کردن کارایی ندارد](/abuse/what-about-spammers/)، برخی "
+"افراد فکر می کنند که تمام شبکه های باز مانند تور بد هستند — آن ها می خواهند "
+"با اعمال زور بر روی ادمین های شبکه در مورد مشکلات مسیریابی، سرویس از "
+"قربانیان باج دریافت کنند."
#: https//support.torproject.org/abuse/nodes-banned-from-mail-server/
#: (content/abuse/mail-server-ban/contents+en.lrquestion.description)
@@ -12290,11 +12325,11 @@ msgstr "هرچه یا تور درحال استفاده نیست."
#: templates/glossary.html:26
msgid "Contributors to item page:"
-msgstr ""
+msgstr "مشارکت کنندگان به صفحه آیتم:"
#: templates/glossary.html:28
msgid "Edit item page"
-msgstr ""
+msgstr "ویرایش صفحه آیتم"
#: templates/glossary.html:29 templates/macros/question.html:19
#: templates/word.html:26
1
0
commit d33a70a47e58cc654ca8f117abcfeae8798258dd
Author: Cecylia Bocovich <cohosh(a)torproject.org>
Date: Mon Apr 13 16:38:51 2020 -0400
Remove accidental files
These files are empty or were accidentially added to the repository
---
MANIFEST.in | 0
strings.patch | 301 ----------------------------------------------------------
2 files changed, 301 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index e69de29..0000000
diff --git a/strings.patch b/strings.patch
deleted file mode 100644
index ea0504a..0000000
--- a/strings.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-From 906bec40b28a7e49ffba3a6e1c646bd81e5441b9 Mon Sep 17 00:00:00 2001
-From: hiro <hiro(a)torproject.org>
-Date: Thu, 9 Jan 2020 12:24:10 +0100
-Subject: [PATCH] Fix current issue with gettor strings splitting #32906 Add
- tests to check sent email messages.
-
----
- gettor/services/email/sendmail.py | 82 ++++++++++++++++++-------------
- gettor/utils/options.py | 8 +--
- gettor/utils/settings.py | 7 +--
- scripts/process_email | 6 ++-
- share/locale/es.json | 2 +-
- tests/conftests.py | 2 +-
- tests/test_email_service.py | 35 ++++++++++++-
- tests/test_twitter.py | 1 +
- 8 files changed, 98 insertions(+), 45 deletions(-)
-
-diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py
-index 53d90f6..356f6c4 100644
---- a/gettor/services/email/sendmail.py
-+++ b/gettor/services/email/sendmail.py
-@@ -100,6 +100,52 @@ class Sendmail(object):
- ).addCallback(self.sendmail_callback).addErrback(self.sendmail_errback)
-
-
-+ def build_help_body_message(self):
-+ body_msg = strings._("help_body_intro")
-+ body_msg += strings._("help_body_paragraph")
-+ body_msg += strings._("help_body_support")
-+
-+ return body_msg
-+
-+
-+ def build_link_strings(self, links, platform, locale):
-+ """
-+ Build the links strings
-+ """
-+
-+ link_msg = None
-+
-+ for link in links:
-+ provider = link[5]
-+ version = link[4]
-+ arch = link[3]
-+ url = link[0]
-+ file = link[7]
-+ sig_url = url + ".asc"
-+
-+ link_str = "Tor Browser {} for {}-{}-{} ({}): {}\n".format(
-+ version, platform, locale, arch, provider, url
-+ )
-+
-+ link_str += "Signature file: {}\n".format(sig_url)
-+
-+ link_msg = "{}\n{}".format(link_msg, link_str)
-+
-+ return link_msg, file
-+
-+
-+ def build_body_message(self, link_msg, platform, file):
-+ body_msg = strings._("links_body_platform").format(platform)
-+ body_msg += strings._("links_body_links").format(link_msg)
-+ body_msg += strings._("links_body_archive")
-+ body_msg += strings._("links_body_internet_archive")
-+ body_msg += strings._("links_body_google_drive")
-+ body_msg += strings._("links_body_internet_archive").format(file)
-+ body_msg += strings._("links_body_ending")
-+
-+ return body_msg
-+
-+
- @defer.inlineCallbacks
- def get_new(self):
- """
-@@ -132,9 +178,7 @@ class Sendmail(object):
- )
- )
-
-- body_msg = strings._("help_body_intro")
-- body_msg += strings._("help_body_paragraph")
-- body_msg += strings._("help_body_support")
-+ body_msg = self.build_help_body_message()
-
- yield self.sendmail(
- email_addr=id,
-@@ -179,36 +223,8 @@ class Sendmail(object):
- )
-
- # build message
-- link_msg = None
-- file = ""
--
-- for link in links:
-- provider = link[5]
-- version = link[4]
-- arch = link[3]
-- url = link[0]
-- file = link[7]
-- sig_url = url + ".asc"
--
-- link_str = "Tor Browser {} for {}-{}-{} ({}): {}\n".format(
-- version, platform, locale, arch, provider, url
-- )
--
-- link_str += "Signature file: {}\n".format(sig_url)
--
-- if link_msg:
-- link_msg = "{}\n{}".format(link_msg, link_str)
-- else:
-- link_msg = link_str
--
-- body_msg = strings._("links_body_platform").format(platform)
-- body_msg += strings._("links_body_links").format(link_msg)
-- body_msg += strings._("links_body_archive")
-- body_msg += strings._("links_body_internet_archive")
-- body_msg += strings._("links_body_google_drive")
-- body_msg += strings._("links_body_internet_archive").format(file)
-- body_msg += strings._("links_body_ending")
--
-+ link_msg, file = self.build_link_strings(links, platform, locale)
-+ body_msg = self.build_body_message(link_msg, platform, file)
- subject_msg = strings._("links_subject")
-
- hid = hashlib.sha256(id.encode('utf-8'))
-diff --git a/gettor/utils/options.py b/gettor/utils/options.py
-index 8504f42..6f8d693 100644
---- a/gettor/utils/options.py
-+++ b/gettor/utils/options.py
-@@ -3,9 +3,7 @@
- This file is part of GetTor, a service providing alternative methods to download
- the Tor Browser.
-
--:authors: Hiro <hiro(a)torproject.org>
-- parser = argparse.ArgumentParser(formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=28))
-- parser.add_argument('--config', metavar='config', please also see AUTHORS file
-+:authors: Hiro <hiro(a)torproject.org> please also see AUTHORS file
- :copyright: (c) 2008-2014, The Tor Project, Inc.
- (c) 2014, all entities within the AUTHORS file
- :license: see included LICENSE for information
-@@ -24,11 +22,13 @@ def load_settings(config):
- settings.load()
- return settings
-
--def parse_settings(locale, config):
-+def parse_settings(locale="en", config=None):
- """
- Parse settings and loads strings in a given locale
- This function needs to be rewritten considering passing a locale and
- returing translated strings
-+
- """
-+
- strings.load_strings(locale)
- return load_settings(config)
-diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py
-index a519755..67c31ec 100644
---- a/gettor/utils/settings.py
-+++ b/gettor/utils/settings.py
-@@ -33,7 +33,8 @@ class Settings(object):
- self.filename = config
- else:
- # Default config
-- self.filename = self.build_filename()
-+ default_config = "/home/gettor/gettor/gettor.conf.json"
-+ self.filename = self.build_filename(default_config)
-
- # Dictionary of available languages,
- # mapped to the language name, in that language
-@@ -41,11 +42,11 @@ class Settings(object):
- self._version = strings.get_version()
- self._settings = {}
-
-- def build_filename(self):
-+ def build_filename(self, file):
- """
- Returns the path of the settings file.
- """
-- return strings.get_resource_path('/home/gettor/gettor/gettor.conf.json', strings.find_run_dir())
-+ return strings.get_resource_path(file, strings.find_run_dir())
-
- def load(self):
- """
-diff --git a/scripts/process_email b/scripts/process_email
-index a5da6eb..37c4e0b 100755
---- a/scripts/process_email
-+++ b/scripts/process_email
-@@ -23,7 +23,8 @@ from gettor.utils import options
-
- @defer.inlineCallbacks
- def process_email(message):
-- settings = options.parse_settings()
-+
-+ settings = options.parse_settings("en", "/home/gettor/gettor/gettor.conf.json")
-
- try:
- ep = EmailParser(settings, "gettor(a)torproject.org")
-@@ -49,7 +50,8 @@ def main():
-
-
- if __name__ == '__main__':
-- settings = options.parse_settings()
-+
-+ settings = options.parse_settings("en", "/home/gettor/gettor/gettor.conf.json")
- email_parser_logfile = settings.get("email_parser_logfile")
- log.startLogging(open(email_parser_logfile, 'a'))
- log.msg("New email request received.", system="process email")
-diff --git a/share/locale/es.json b/share/locale/es.json
-index be7dd33..8ac5705 100644
---- a/share/locale/es.json
-+++ b/share/locale/es.json
-@@ -15,7 +15,7 @@
- "help_config": "Custom config file location (optional)",
- "smtp_links_subject": "[GetTor] Links for your request",
- "smtp_mirrors_subject": "[GetTor] Mirrors",
-- "smtp_help_subject": "[GetTor] Help",
-+ "smtp_help_subject": "[GetTor] Ayuda",
- "smtp_unsupported_locale_subject": "[GetTor] Unsupported locale",
- "smtp_unsupported_locale_msg": "The locale you requested '{}' is not supported."
- }
-diff --git a/tests/conftests.py b/tests/conftests.py
-index f5194a5..cbb4d28 100644
---- a/tests/conftests.py
-+++ b/tests/conftests.py
-@@ -5,7 +5,7 @@ from __future__ import unicode_literals
- from gettor.utils import options
- from gettor.utils import strings
- from gettor.utils import twitter
--from gettor.services.email import sendmail
-+from gettor.services.email.sendmail import Sendmail
- from gettor.services.twitter import twitterdm
- from gettor.parse.email import EmailParser, AddressError, DKIMError
- from gettor.parse.twitter import TwitterParser
-diff --git a/tests/test_email_service.py b/tests/test_email_service.py
-index 8e60f7a..ff364f0 100644
---- a/tests/test_email_service.py
-+++ b/tests/test_email_service.py
-@@ -14,8 +14,20 @@ class EmailServiceTests(unittest.TestCase):
- timeout = 15
- def setUp(self):
- self.settings = conftests.options.parse_settings("en","./gettor.conf.json")
-- self.sm_client = conftests.sendmail.Sendmail(self.settings)
-+ self.sm_client = conftests.Sendmail(self.settings)
- self.locales = conftests.strings.get_locales()
-+ self.links = [
-+ [
-+ "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/TorB…",
-+ "osx",
-+ "en-US",
-+ "64",
-+ "9.0.3",
-+ "gitlab",
-+ "ACTIVE",
-+ "TorBrowser-9.0.3-osx64_en-US.dmg"
-+ ]
-+ ]
-
- def tearDown(self):
- print("tearDown()")
-@@ -76,6 +88,27 @@ class EmailServiceTests(unittest.TestCase):
- self.assertEqual(request["platform"], "osx")
- self.assertEqual(request["language"], "en")
-
-+ def test_sent_links_message(self):
-+ ep = self.sm_client
-+ links = self.links
-+ link_msg, file = ep.build_link_strings(links, "osx", "en")
-+ assert "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/TorB…" in link_msg
-+ assert "osx" in link_msg
-+
-+ self.assertEqual("TorBrowser-9.0.3-osx64_en-US.dmg", file)
-+
-+ def test_sent_body_message(self):
-+ ep = self.sm_client
-+ links = self.links
-+ link_msg, file = ep.build_link_strings(links, "osx", "en")
-+ body_msg = ep.build_body_message(link_msg, "osx", file)
-+ assert "You requested Tor Browser for osx" in body_msg
-+
-+ def test_help_body_message(self):
-+ ep = self.sm_client
-+ help_msg = ep.build_help_body_message()
-+ assert "This is how you can request a tor browser bundle link" in help_msg
-+
-
- if __name__ == "__main__":
- unittest.main()
-diff --git a/tests/test_twitter.py b/tests/test_twitter.py
-index 7458cfc..a1515d0 100644
---- a/tests/test_twitter.py
-+++ b/tests/test_twitter.py
-@@ -20,6 +20,7 @@ class TwitterTests(unittest.TestCase):
-
- def test_load_messages(self):
- data = self.tw_client.twitter_data()
-+ print(data)
- assert data['events']
-
-
---
-2.20.1
-
1
0
commit 880912bb2ca468d1a6a52dd6e9f318df3903f7ca
Author: Cecylia Bocovich <cohosh(a)torproject.org>
Date: Mon Apr 13 16:28:24 2020 -0400
Remove all old upload scripts
These have been replaced by newer scripts located in the top-level
scripts/ directory.
---
upload/bundles2drive.py | 315 --------------------------------------
upload/bundles2dropbox.py | 150 ------------------
upload/bundles2github.py | 158 -------------------
upload/drive.cfg | 9 --
upload/dropbox.cfg | 8 -
upload/fetch_latest_torbrowser.py | 134 ----------------
upload/github.cfg | 8 -
upload/landing_gh.tpl | 137 -----------------
upload/latest_torbrowser.cfg | 3 -
upload/readme_gh.tpl | 40 -----
upload/torbrowser-key.asc | Bin 25381 -> 0 bytes
11 files changed, 962 deletions(-)
diff --git a/upload/bundles2drive.py b/upload/bundles2drive.py
deleted file mode 100644
index 0acada5..0000000
--- a/upload/bundles2drive.py
+++ /dev/null
@@ -1,315 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of GetTor, a Tor Browser distribution system.
-#
-# :authors: poly <poly(a)darkdepths.net>
-# Israel Leiva <ilv(a)riseup.net>
-# see also AUTHORS file
-#
-# :copyright: (c) 2008-2014, The Tor Project, Inc.
-# (c) 2014, Poly
-# (c) 2014, Israel Leiva
-#
-# :license: This is Free Software. See LICENSE for license information.
-
-import re
-import os
-import gnupg
-import hashlib
-import logging
-import argparse
-import ConfigParser
-import gettor.core
-from gettor.utils import get_bundle_info, get_file_sha256, valid_format
-
-# import google drive libs
-import httplib2
-from apiclient.discovery import build
-from apiclient.http import MediaFileUpload
-from apiclient import errors
-from oauth2client.client import FlowExchangeError
-from oauth2client.client import OAuth2WebServerFlow
-from oauth2client.client import Credentials
-
-
-def upload_files(client, basedir):
- """Upload files to Google Drive.
-
- Looks for tor browser files inside basedir.
-
- :param: basedir (string) path of the folder with the files to be
- uploaded.
- :param: client (object) Google Drive object.
-
- :raise: UploadError if something goes wrong while uploading the
- files to Google Drive. All files are uploaded to '/'.
-
- :return: (dict) the names of the uploaded files as the keys,
- and file id as the value
-
- """
- files = []
-
- for name in os.listdir(basedir):
- path = os.path.abspath(os.path.join(basedir, name))
- if os.path.isfile(path) and valid_format(name, 'linux'):
- files.append(name)
-
- for name in os.listdir(basedir):
- path = os.path.abspath(os.path.join(basedir, name))
- if os.path.isfile(path) and valid_format(name, 'windows'):
- files.append(name)
-
- for name in os.listdir(basedir):
- path = os.path.abspath(os.path.join(basedir, name))
- if os.path.isfile(path) and valid_format(name, 'osx'):
- files.append(name)
-
- # dictionary to store file names and IDs
- files_dict = dict()
-
- for file in files:
- asc = "%s.asc" % file
- abs_file = os.path.abspath(os.path.join(basedir, file))
- abs_asc = os.path.abspath(os.path.join(basedir, asc))
-
- if not os.path.isfile(abs_asc):
- # there are some .mar files that don't have .asc, don't upload it
- continue
-
- # upload tor browser installer
- file_body = MediaFileUpload(
- abs_file,
- mimetype="application/octet-stream",
- resumable=True
- )
- body = {
- 'title': file
- }
- print "Uploading '%s'..." % file
- try:
- file_data = drive_service.files().insert(
- body=body,
- media_body=file_body
- ).execute()
- except errors.HttpError, e:
- print str(e)
-
- # upload signature
- asc_body = MediaFileUpload(abs_asc, resumable=True)
- asc_head = {
- 'title': "%s.asc" % file
- }
- print "Uploading '%s'..." % asc
- try:
- asc_data = drive_service.files().insert(
- body=asc_head,
- media_body=asc_body
- ).execute()
- except errors.HttpError, e:
- print str(e)
-
- # add filenames and file id to dict
- files_dict[file] = file_data['id']
- files_dict[asc] = asc_data['id']
-
- return files_dict
-
-
-def share_file(service, file_id):
- """Make files public
-
- For a given file-id, sets role 'reader' to 'anyone'. Returns public
- link to file.
-
- :param: file_id (string)
-
- :return: (string) url to shared file
-
- """
- permission = {
- 'type': "anyone",
- 'role': "reader",
- 'withLink': True
- }
-
- try:
- service.permissions().insert(
- fileId=file_id,
- body=permission
- ).execute()
- except errors.HttpError, error:
- print('An error occured while sharing: %s' % file_id)
-
- try:
- file = service.files().get(fileId=file_id).execute()
- except errors.HttpError, error:
- print('Error occured while fetch public link for file: %s' % file_id)
-
- print "Uploaded %s to %s" % (file['title'], file['webContentLink'])
- return file['webContentLink']
-
-
-def get_files_links(service, v):
- """Print links of uploaded files.
-
- :param: service (object): Goolge Drive service object.
- :param: v (string): Version of Tor Browser to look for.
-
- """
-
- windows_re = 'torbrowser-install-%s_\w\w(-\w\w)?\.exe(\.asc)?' % v
- linux_re = 'tor-browser-linux\d\d-%s_(\w\w)(-\w\w)?\.tar\.xz(\.asc)?' % v
- osx_re = 'TorBrowser-%s-osx\d\d_(\w\w)(-\w\w)?\.dmg(\.asc)?' % v
-
- # dictionary to store file names and IDs
- files_dict = dict()
-
- print "Trying to fetch links of uploaded files..."
- links = service.files().list().execute()
- items = links.get('items', [])
-
- if not items:
- raise ValueError('No files found.')
-
- else:
- for item in items:
- if re.search(windows_re, item['title']):
- files_dict[item['title']] = item['id']
- elif re.search(linux_re, item['title']):
- files_dict[item['title']] = item['id']
- elif re.search(osx_re, item['title']):
- files_dict[item['title']] = item['id']
- return files_dict
-
-if __name__ == '__main__':
- parser = argparse.ArgumentParser(
- description='Utility to upload Tor Browser to Google Drive.'
- )
-
- # if no LC specified, download all
- parser.add_argument(
- '-l', '--links', default=None,
- help='Create links file with files already uploaded and '\
- 'matching the specified version. '
- )
-
- args = parser.parse_args()
-
- config = ConfigParser.ConfigParser()
- config.read('drive.cfg')
-
- client_id = config.get('app', 'client-id')
- app_secret = config.get('app', 'secret')
- refresh_token = config.get('app', 'refresh_token')
- upload_dir = config.get('general', 'upload_dir')
-
- # important: this key must be the one that signed the packages
- tbb_key = config.get('general', 'tbb_key')
-
- # requests full access to drive account
- OAUTH_SCOPE = 'https://www.googleapis.com/auth/drive'
- REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob'
-
- print "Authenticating..."
-
- flow = OAuth2WebServerFlow(
- client_id,
- app_secret,
- OAUTH_SCOPE,
- redirect_uri=REDIRECT_URI
- )
-
- # If no valid token found, need to prompt user.
- # this should only occur once
- if not refresh_token:
- flow.params['access_type'] = 'offline'
- flow.params['approval_prompt'] = 'force'
- authorize_url = flow.step1_get_authorize_url()
- print 'Go to the following link in your browser: ' + authorize_url
- code = raw_input('Enter verification code: ').strip()
- try:
- credentials = flow.step2_exchange(code)
- except FlowExchangeError as e:
- print str(e)
-
- # oauth2 credentials instance must be stored as json string
- config.set('app', 'refresh_token', credentials.to_json())
- with open('drive.cfg', 'wb') as configfile:
- config.write(configfile)
- else:
- # we already have a valid token
- credentials = Credentials.new_from_json(refresh_token)
-
- # authenticate with oauth2
- http = httplib2.Http()
- http = credentials.authorize(http)
-
- # initialize drive instance
- drive_service = build('drive', 'v2', http=http)
-
- # import key fingerprint
- gpg = gnupg.GPG()
- key_data = open(tbb_key).read()
- import_result = gpg.import_keys(key_data)
- fp = import_result.results[0]['fingerprint']
-
- # make groups of four characters to make fingerprint more readable
- # e.g. 123A 456B 789C 012D 345E 678F 901G 234H 567I 890J
- readable = ' '.join(fp[i:i+4] for i in xrange(0, len(fp), 4))
-
- try:
- # helpful when something fails but files are uploaded.
- if args.links:
- uploaded_files = get_files_links(drive_service, args.links)
-
- if not uploaded_files:
- raise ValueError("There are no files for that version")
- else:
- uploaded_files = upload_files(drive_service, upload_dir)
- # use default config
- core = gettor.core.Core('/home/gettor/core.cfg')
-
- # erase old links
- core.create_links_file('Drive', readable)
-
- # recognize file OS by its extension
- p1 = re.compile('.*\.tar.xz$')
- p2 = re.compile('.*\.exe$')
- p3 = re.compile('.*\.dmg$')
- p4 = re.compile('.*\.asc$')
-
- for file in uploaded_files.keys():
- # only run for tor browser installers
- if p4.match(file):
- continue
- asc = "%s.asc" % file
- abs_file = os.path.abspath(os.path.join(upload_dir, file))
- abs_asc = os.path.abspath(os.path.join(upload_dir, asc))
-
- sha_file = get_file_sha256(abs_file)
-
- # build links
- link_file = share_file(
- drive_service,
- uploaded_files[file]
- )
-
- link_asc = share_file(
- drive_service,
- uploaded_files["%s.asc" % file]
- )
-
- if p1.match(file):
- osys, arch, lc = get_bundle_info(file, 'linux')
- elif p2.match(file):
- osys, arch, lc = get_bundle_info(file, 'windows')
- elif p3.match(file):
- osys, arch, lc = get_bundle_info(file, 'osx')
-
- link = "%s$%s$%s$" % (link_file, link_asc, sha_file)
-
- # note that you should only upload bundles for supported locales
- core.add_link('Drive', osys, lc, link)
- except (ValueError, RuntimeError) as e:
- print str(e)
diff --git a/upload/bundles2dropbox.py b/upload/bundles2dropbox.py
deleted file mode 100644
index 04e86af..0000000
--- a/upload/bundles2dropbox.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of GetTor, a Tor Browser distribution system.
-#
-# :authors: Israel Leiva <ilv(a)riseup.net>
-# see also AUTHORS file
-#
-# :copyright: (c) 2008-2014, The Tor Project, Inc.
-# (c) 2014, Israel Leiva
-#
-# :license: This is Free Software. See LICENSE for license information.
-
-import re
-import os
-import gnupg
-import hashlib
-import ConfigParser
-
-import dropbox
-import gettor.core
-from gettor.utils import get_bundle_info, get_file_sha256, valid_format
-
-
-def upload_files(basedir, client):
- """Upload files to Dropbox.
-
- Looks for files ending with 'tar.xz' inside basedir.
-
- :param: basedir (string) path of the folder with the files to be
- uploaded.
- :param: client (object) DropboxClient object.
-
- :raise: ValueError if the .xz file doesn't have an .asc file.
- :raise: UploadError if something goes wrong while uploading the
- files to Dropbox. All files are uploaded to '/'.
-
- :return: (list) the names of the uploaded files.
-
- """
- files = []
-
- for name in os.listdir(basedir):
- path = os.path.abspath(os.path.join(basedir, name))
- if os.path.isfile(path) and valid_format(name, 'linux'):
- files.append(name)
-
- for name in os.listdir(basedir):
- path = os.path.abspath(os.path.join(basedir, name))
- if os.path.isfile(path) and valid_format(name, 'windows'):
- files.append(name)
-
- for name in os.listdir(basedir):
- path = os.path.abspath(os.path.join(basedir, name))
- if os.path.isfile(path) and valid_format(name, 'osx'):
- files.append(name)
-
- for file in files:
- asc = "%s.asc" % file
- abs_file = os.path.abspath(os.path.join(basedir, file))
- abs_asc = os.path.abspath(os.path.join(basedir, asc))
-
- if not os.path.isfile(abs_asc):
- # there are some .mar files that don't have .asc, don't upload it
- continue
-
- # chunk upload for big files
- to_upload = open(abs_file, 'rb')
- size = os.path.getsize(abs_file)
- uploader = client.get_chunked_uploader(to_upload, size)
- while uploader.offset < size:
- try:
- upload = uploader.upload_chunked()
- except dropbox.rest.ErrorResponse, e:
- print("An error ocurred while uploading %s: %s" % abs_file, e)
- uploader.finish(file)
- print "Uploading %s" % file
-
- # this should be small, upload it simple
- to_upload_asc = open(abs_asc, 'rb')
- response = client.put_file(asc, to_upload_asc)
- print "Uploading %s" % asc
-
- return files
-
-if __name__ == '__main__':
- config = ConfigParser.ConfigParser()
- config.read('dropbox.cfg')
-
- app_key = config.get('app', 'key')
- app_secret = config.get('app', 'secret')
- access_token = config.get('app', 'access_token')
- upload_dir = config.get('general', 'upload_dir')
-
- # important: this key must be the one that signed the packages
- tbb_key = config.get('general', 'tbb_key')
-
- client = dropbox.client.DropboxClient(access_token)
-
- # import key fingerprint
- gpg = gnupg.GPG()
- key_data = open(tbb_key).read()
- import_result = gpg.import_keys(key_data)
- fp = import_result.results[0]['fingerprint']
-
- # make groups of four characters to make fingerprint more readable
- # e.g. 123A 456B 789C 012D 345E 678F 901G 234H 567I 890J
- readable = ' '.join(fp[i:i+4] for i in xrange(0, len(fp), 4))
-
- try:
- uploaded_files = upload_files(upload_dir, client)
- # use default config
- core = gettor.core.Core('/home/gettor/core.cfg')
-
- # erase old links
- core.create_links_file('Dropbox', readable)
-
- # recognize file OS by its extension
- p1 = re.compile('.*\.tar.xz$')
- p2 = re.compile('.*\.exe$')
- p3 = re.compile('.*\.dmg$')
-
- for file in uploaded_files:
- # build file names
- asc = "%s.asc" % file
- abs_file = os.path.abspath(os.path.join(upload_dir, file))
- abs_asc = os.path.abspath(os.path.join(upload_dir, asc))
-
- sha_file = get_file_sha256(abs_file)
-
- # build links
- link_file = client.share(file, short_url=False)
- # if someone finds how to do this with the API, please tell me!
- link_file[u'url'] = link_file[u'url'].replace('?dl=0', '?dl=1')
- link_asc = client.share(asc, short_url=False)
- link_asc[u'url'] = link_asc[u'url'].replace('?dl=0', '?dl=1')
- if p1.match(file):
- osys, arch, lc = get_bundle_info(file, 'linux')
- elif p2.match(file):
- osys, arch, lc = get_bundle_info(file, 'windows')
- elif p3.match(file):
- osys, arch, lc = get_bundle_info(file, 'osx')
-
- link = "%s$%s$%s$" % (link_file[u'url'], link_asc[u'url'], sha_file)
-
- # note that you should only upload bundles for supported locales
- core.add_link('Dropbox', osys, lc, link)
- except (ValueError, RuntimeError) as e:
- print str(e)
- except dropbox.rest.ErrorResponse as e:
- print str(e)
diff --git a/upload/bundles2github.py b/upload/bundles2github.py
deleted file mode 100644
index ee157f0..0000000
--- a/upload/bundles2github.py
+++ /dev/null
@@ -1,158 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of GetTor, a Tor Browser distribution system.
-#
-# :authors: Israel Leiva <ilv(a)torproject.org>
-# see also AUTHORS file
-#
-# :copyright: (c) 2015, The Tor Project, Inc.
-# (c) 2015, Israel Leiva
-#
-# :license: This is Free Software. See LICENSE for license information.
-#
-
-# Use pyopenssl to verify TLS certifcates
-try:
- import urllib3.contrib.pyopenssl
- urllib3.contrib.pyopenssl.inject_into_urllib3()
-except ImportError:
- pass
-
-import os
-import sys
-import argparse
-import ConfigParser
-import gnupg
-
-import github3
-
-import gettor.core
-from gettor.utils import (get_bundle_info, get_file_sha256,
- find_files_to_upload)
-
-
-def upload_new_release(github_repo, version, upload_dir):
- """
- Returns a Release object
- """
-
- # Create a new release of this TBB
- release = target_repo.create_release(
- 'v{}'.format(version),
- target_commitish="master",
- name='Tor Browser {}'.format(version),
- body='',
- draft=True,
- )
-
- for filename in find_files_to_upload(upload_dir):
- # Upload each file for this release
- file_path = os.path.join(upload_dir, filename)
- print("Uploading file {}".format(filename))
- release.upload_asset('application/zip',
- filename, open(file_path, 'rb'))
-
- return release
-
-
-if __name__ == '__main__':
- parser = argparse.ArgumentParser(
- description='Utility to upload Tor Browser to Github.'
- )
-
- # with this we only get the links of files already uploaded
- # useful when somethings fail after uploading
- parser.add_argument(
- '-l', '--links', default=None,
- help='Create links file with files already uploaded.'
- )
-
- args = parser.parse_args()
-
- config = ConfigParser.ConfigParser()
- config.read('github.cfg')
-
- tbb_version_path = config.get('general', 'version_cfg_path')
-
- tbb_version_config = ConfigParser.ConfigParser()
- tbb_version_config.read(tbb_version_path)
- version = tbb_version_config.get('version', 'current')
-
- # the token allow us to run this script without GitHub user/pass
- github_access_token = config.get('app', 'access_token')
-
- # path to the fingerprint that signed the packages
- tb_key = config.get('general', 'tbb_key_path')
-
- # path to the latest version of Tor Browser
- tb_path = config.get('general', 'latest_path')
-
- # path to gettor code configuration
- core_path = config.get('general', 'core_path')
-
- # user and repository where we upload Tor Browser
- github_user = config.get('app', 'user')
- github_repo = config.get('app', 'repo')
-
- gh = github3.login(token=github_access_token)
- target_repo = gh.repository(github_user, github_repo)
-
- # import key fingerprint
- gpg = gnupg.GPG()
- key_data = open(tb_key).read()
- import_result = gpg.import_keys(key_data)
- fp = import_result.results[0]['fingerprint']
-
- # make groups of four characters to make fingerprint more readable
- # e.g. 123A 456B 789C 012D 345E 678F 901G 234H 567I 890J
- readable_fp = ' '.join(fp[i:i+4] for i in xrange(0, len(fp), 4))
-
- # Find any published releases with this version number
- for release in target_repo.releases():
- if release.tag_name == 'v{}'.format(version) and not release.draft:
- print("Found an existing published release with this version. "
- "Not uploading again unless you delete the published "
- "release '{}'.".format(release.tag_name))
- break
- else:
- release = None
-
- if args.links or release:
- # Only generating link file, should use previously published release
- if not release:
- print("Error occured! Could not find a published release for "
- "version {}".format(version))
- sys.exit(1)
-
- else:
- # Remove any drafts to clean broken uploads
- print('Uploading release, please wait, this might take a while!')
- # Upload the latest browser bundles to a new release
- release = upload_new_release(target_repo, version, tb_path)
-
- # Upload success, publish the release
- release.edit(draft=False)
-
- # Create the links file for this release
- core = gettor.core.Core(core_path)
-
- # Erase old links if any and create a new empty one
- core.create_links_file('GitHub', readable_fp)
-
- print("Creating links file")
- for asset in release.assets():
- url = asset.browser_download_url
- if url.endswith('.asc'):
- continue
-
- osys, arch, lc = get_bundle_info(asset.name)
- sha256 = get_file_sha256(
- os.path.abspath(os.path.join(tb_path, asset.name))
- )
-
- link = "{}${}${}$".format(url, url + ".asc", sha256)
-
- print("Adding {}".format(url))
- core.add_link('GitHub', osys, lc, link)
-
- print "Github links updated!"
diff --git a/upload/drive.cfg b/upload/drive.cfg
deleted file mode 100644
index a71bf57..0000000
--- a/upload/drive.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-[general]
-upload_dir = latest
-tbb_key = torbrowser-key.asc
-
-[app]
-client-id =
-secret =
-refresh_token =
-
diff --git a/upload/dropbox.cfg b/upload/dropbox.cfg
deleted file mode 100644
index 7528565..0000000
--- a/upload/dropbox.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[general]
-upload_dir: latest
-tbb_key: torbrowser-key.asc
-
-[app]
-key: suchkey
-secret: suchsecret
-access_token: suchtoken
diff --git a/upload/fetch_latest_torbrowser.py b/upload/fetch_latest_torbrowser.py
deleted file mode 100644
index 3fe1f9a..0000000
--- a/upload/fetch_latest_torbrowser.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of GetTor, a Tor Browser distribution system.
-#
-# :authors: Israel Leiva <ilv(a)torproject.org>
-#
-# :copyright: (c) 2015, The Tor Project, Inc.
-# (c) 2015, Israel Leiva
-#
-# :license: This is Free Software. See LICENSE for license information.
-#
-
-import os
-
-import urllib2
-import json
-import argparse
-import ConfigParser
-import shutil
-
-# this path should be relative to this script (or absolute)
-UPLOAD_SCRIPTS = {
- 'dropbox': 'bundles2dropbox.py',
- 'drive': 'bundles2drive.py'
-}
-
-# "regex" for filtering downloads in wget
-OS_RE = {
- 'windows': '%s.exe,%s.exe.asc',
- 'linux': '%s.tar.xz,%s.tar.xz.asc',
- 'osx': '%s.dmg,%s.dmg.asc',
-}
-
-
-def main():
- """Script to fetch the latest Tor Browser.
-
- Fetch the latest version of Tor Browser and upload it to the supported
- providers (e.g. Dropbox). Ideally, this script should be executed with
- a cron in order to automate the updating of the files served by GetTor
- when a new version of Tor Browser is released.
-
- Usage: python2.7 fetch.py --os=<OS> --lc=<LC>
-
- Some fetch examples:
-
- Fetch Tor Browser for all platforms and languages:
- $ python2.7 fetch.py
-
- Fetch Tor Browser only for Linux:
- $ python2.7 fetch.py --os=linux
-
- Fetch Tor Browser only for Windows and in US English:
- $ python2.7 fetch.py --os=windows --lc=en-US
-
- Fetch Tor Browser for all platforms, but only in Spanish:
- $ python2.7 fetch.py --lc=es-ES
-
- """
- parser = argparse.ArgumentParser(
- description='Utility to fetch the latest Tor Browser and upload it \
- to popular cloud services.'
- )
-
- # if no OS specified, download all
- parser.add_argument('-o', '--os', default=None,
- help='filter by OS')
-
- # if no LC specified, download all
- parser.add_argument('-l', '--lc', default='',
- help='filter by locale')
-
- args = parser.parse_args()
-
- # server from which to download Tor Browser
- dist_tpo = 'https://dist.torproject.org/torbrowser/'
-
- # find out the latest version
- url = 'https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions'
- response = urllib2.urlopen(url)
- json_response = json.load(response)
- latest_version = json_response[0]
-
- # find out the current version delivered by GetTor
- config = ConfigParser.RawConfigParser()
- config.read('latest_torbrowser.cfg')
- current_version = config.get('version', 'current')
-
- if current_version != latest_version:
- mirror = '%s%s/' % (dist_tpo, latest_version)
-
- # what LC should we download?
- lc_re = args.lc
-
- # what OS should we download?
- if args.os == 'windows':
- os_re = OS_RE['windows'] % (lc_re, lc_re)
-
- elif args.os == 'osx':
- os_re = OS_RE['osx'] % (lc_re, lc_re)
-
- elif args.os == 'linux':
- os_re = OS_RE['linux'] % (lc_re, lc_re)
-
- else:
- os_re = '%s.exe,%s.exe.asc,%s.dmg,%s.dmg.asc,%s.tar.xz,%s.tar'\
- '.xz.asc' % (lc_re, lc_re, lc_re, lc_re, lc_re, lc_re)
-
- params = "-nH --cut-dirs=1 -L 1 --accept %s" % os_re
-
- # in wget we trust
- cmd = 'wget %s --mirror %s' % (params, mirror)
-
- print "Going to execute %s" % cmd
- # make the mirror
- # a folder with the value of 'latest_version' will be created
- os.system(cmd)
- # everything inside upload will be uploaded by the provivers' scripts
- shutil.move('latest', 'latest_backup')
- shutil.move(latest_version, 'latest')
- shutil.rmtree('latest_backup')
-
- # latest version of Tor Browser has been syncronized
- # let's upload it
- for provider in UPLOAD_SCRIPTS:
- os.system('python2.7 %s' % UPLOAD_SCRIPTS[provider])
-
- # if everything is OK, update the current version delivered by GetTor
- config.set('version', 'current', latest_version)
- with open(r'latest_torbrowser.cfg', 'wb') as config_file:
- config.write(config_file)
-
-if __name__ == "__main__":
- main()
diff --git a/upload/github.cfg b/upload/github.cfg
deleted file mode 100644
index 7bdbd90..0000000
--- a/upload/github.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[general]
-upload_dir: latest
-tbb_key: torbrowser-key.asc
-
-[app]
-access_token: suchtoken
-user: username
-repo: gettor-front
diff --git a/upload/landing_gh.tpl b/upload/landing_gh.tpl
deleted file mode 100644
index 771756a..0000000
--- a/upload/landing_gh.tpl
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <meta name="description" content="">
- <meta name="author" content="">
- <title>GetTor | Download Tor Browser for Windows, Linux, OS X</title>
- <link href="css/bootstrap.min.css" rel="stylesheet">
- <link href="css/gettor.css" rel="stylesheet">
- </head>
-
- <body>
-
- <nav class="navbar navbar-inverse navbar-fixed-top">
- <div class="container">
- <div class="navbar-header">
- <span class="navbar-brand">
- <span id="head-title">GetTor - Github mirror</span>
- </span>
- </div>
- <div class="navbar-right">
- <span class="navbar-brand">
- <span id="head-link"><a href="https://www.torproject.org">The Tor Project</a></span>
- </span>
- </div>
- </div>
- </nav>
-
- <div id="main">
- <div class="container text-justify">
- <!-- <div class="row lang well">
- Supported languages: <strong>English</strong>, <a href="fa/index.html">Farsi</a>, <a href="zh/index.html">Chinese</a>, <a href="tr/index.html">Turkish</a>.
- </div>-->
- <br />
- <div class="row">
- <div class="col-lg-2">
- <img src="img/gettor-logo.png">
- </div>
- <div class="col-lg-10" id="description">
- <p>
- <h1>Download Tor Browser</h1>
- <hr />
- Below you will find links to download the latest version of Tor Browser (%TB_VERSION%)<!-- and Orbot (%ORBOT_VERSION%) -->.
- </p>
- </div>
- </div>
- <br />
- <div class="row">
- <div class="col-lg-5">
- <h2>Direct downloads</h2>
- <!--
- <div class="row well">
-
- <div class="col-lg-2">
- <img src="img/android-logo.png" class="pad-big-right">
- </div>
- <div class="col-lg-10">
- <a href="#" class="big-link">Tor Browser for Android</a><br />(<a href="#">signature file</a>)
- </div>
- </div> -->
- <div class="row well">
- <div class="col-lg-2">
- <img src="img/windows-logo.png" class="pad-big-right">
- </div>
- <div class="col-lg-10">
- <span class="big-link">Tor Browser for Windows</span><br />
- <a href="%WINDOWS_EN%">English</a>, <a href="%WINDOWS_FA%">Farsi</a>, <a href="%WINDOWS_ZH%">Chinese</a>, <a href="%WINDOWS_TR%">Turkish</a>
- </div>
- </div>
- <div class="row well">
- <div class="col-lg-2">
- <img src="img/osx-logo.png" class="pad-big-right">
- </div>
- <div class="col-lg-10">
- <span class="big-link">Tor Browser for OS X</span><br />
- <a href="%OSX_EN%">English</a>, <a href="%OSX_FA%">Farsi</a>, <a href="%OSX_ZH%">Chinese</a>, <a href="%OSX_TR%">Turkish</a>
- </div>
- </div>
- <div class="row well">
- <div class="col-lg-2">
- <img src="img/linux-logo.png" class="pad-big-right">
- </div>
- <div class="col-lg-10">
- <span class="big-link">Tor Browser for Linux 32-bit</span><br />
- <a href="%LINUX32_EN%">English</a>, <a href="%LINUX32_FA%">Farsi</a>, <a href="%LINUX32_ZH%">Chinese</a>, <a href="%LINUX32_TR%">Turkish</a>
- </div>
- </div>
- <div class="row well">
- <div class="col-lg-2">
- <img src="img/linux-logo.png" class="pad-big-right">
- </div>
- <div class="col-lg-10">
- <span class="big-link">Tor Browser for Linux 64-bit</span><br />
- <a href="%LINUX64_EN%">English</a>, <a href="%LINUX64_FA%">Farsi</a>, <a href="%LINUX64_ZH%">Chinese</a>, <a href="%LINUX64_TR%">Turkish</a>
- </div>
- </div>
- </div>
- <div class="col-lg-5 col-lg-offset-2">
- <h2>Alternative downloads</h2>
- <div class="row well">
- <span class="mid-title">Get links via Email</span>: You can send an email to <a href="mailto:gettor@torproject.org">gettor(a)torproject.org</a>.
- Send the word <strong>help</strong> in the body of the message to learn how to interact with it.
- </div>
- <div class="row well">
- <span class="mid-title">Get links via XMPP</span>: You can send a message to <a href="#">get_tor(a)riseup.net</a> using your favorite XMPP client. Simply
- enter <strong>help</strong> in an XMPP message to learn how to interact with it.
- </div>
- <div class="row well">
- <span class="mid-title">Get links via Twitter</span>: You can send a direct message to <a href="https://twitter.com/get_tor">@get_tor</a> account
- (you don't need to follow). Send the word <strong>help</strong> in a direct message to learn
- how to interact with it.
- </div>
- <h2>Get bridges</h2>
- <div class="row well">
- Bridges are Tor relays that help you circumvent censorship. If you suspect your access to the
- Tor network is being blocked, you may want to use bridges. You can get bridges from
- the <a href="https://bridges.torproject.org">HTTP distributor</a>. You can also send
- an email to <a href="mailto:bridges@torproject.org">bridges(a)torproject.org</a> <span class="note">
- (please note that you must send the email using an address from one of the following email providers: riseup, gmail or yahoo).</span>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <hr />
-
- <footer class="container">
- <p>© The Tor Project 2016</p>
- </footer>
-
- </div>
-
- </body>
-</html>
diff --git a/upload/latest_torbrowser.cfg b/upload/latest_torbrowser.cfg
deleted file mode 100644
index 0abe3fb..0000000
--- a/upload/latest_torbrowser.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[version]
-current = 4.0.3
-
diff --git a/upload/readme_gh.tpl b/upload/readme_gh.tpl
deleted file mode 100644
index 63ed23a..0000000
--- a/upload/readme_gh.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-# Download Tor Browser
-
-In this repository you will find links to download the latest version of
-Tor Browser, which currently is %TB_VERSION%. Please select one of the links below:
-
-## Windows
-[Download Tor Browser](%WINDOWS_EN%) (English) ([signature file](%WINDOWS_EN_SIG%)).
-
-[Download Tor Browser](%WINDOWS_FA%) (Farsi) ([signature file](%WINDOWS_FA_SIG%)).
-
-[Download Tor Browser](%WINDOWS_TR%) (Turkish) ([signature file](%WINDOWS_TR_SIG%)).
-
-[Download Tor Browser](%WINDOWS_ZH%) (Chinese) ([signature file](%WINDOWS_ZH_SIG%)).
-
-## OS X
-[Download Tor Browser](%OSX_EN%) (English) ([signature file](%OSX_EN_SIG%)).
-
-[Download Tor Browser](%OSX_FA%) (Farsi) ([signature file](%OSX_FA_SIG%)).
-
-[Download Tor Browser](%OSX_TR%) (Turkish) ([signature file](%OSX_TR_SIG%)).
-
-[Download Tor Browser](%OSX_ZH%) (Chinese) ([signature file](%OSX_ZH_SIG%)).
-
-## Linux 32-bit
-[Download Tor Browser](%LINUX32_EN%) (English) ([signature file](%LINUX32_EN_SIG%)).
-
-[Download Tor Browser](%LINUX32_FA%) (Farsi) ([signature file](%LINUX32_FA_SIG%)).
-
-[Download Tor Browser](%LINUX32_TR%) (Turkish) ([signature file](%LINUX32_TR_SIG%)).
-
-[Download Tor Browser](%LINUX32_ZH%) (Chinese) ([signature file](%LINUX32_ZH_SIG%)).
-
-## Linux 64-bit
-[Download Tor Browser](%LINUX64_EN%) (English) ([signature file](%LINUX64_EN_SIG%)).
-
-[Download Tor Browser](%LINUX64_FA%) (Farsi) ([signature file](%LINUX64_FA_SIG%)).
-
-[Download Tor Browser](%LINUX64_TR%) (Turkish) ([signature file](%LINUX64_TR_SIG%)).
-
-[Download Tor Browser](%LINUX64_ZH%) (Chinese) ([signature file](%LINUX64_ZH_SIG%)).
diff --git a/upload/torbrowser-key.asc b/upload/torbrowser-key.asc
deleted file mode 100644
index 345f65d..0000000
Binary files a/upload/torbrowser-key.asc and /dev/null differ
1
0
commit e96087d7459b103a8d5fcd5786623a0ae1fee748
Author: Cecylia Bocovich <cohosh(a)torproject.org>
Date: Mon Apr 13 16:31:03 2020 -0400
Remove GetTor website mirror code
This used to be the location of the code for gettor.torproject.org, but
that has been moved into a separate repository. While this old code is
suitable for GetTor mirror sites, it is very out of date and unclear
whether we want to support this going forward.
---
www/README.md | 3 -
www/css/bootstrap.min.css | 10 -
www/css/gettor.css | 83 --------
www/fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes
www/fonts/glyphicons-halflings-regular.svg | 288 ---------------------------
www/fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes
www/fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes
www/fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes
www/fonts/lato-bold.woff | Bin 46160 -> 0 bytes
www/fonts/lato-italic.woff | Bin 47168 -> 0 bytes
www/fonts/lato-regular.woff | Bin 46108 -> 0 bytes
www/img/android-logo.png | Bin 3320 -> 0 bytes
www/img/gettor-logo.png | Bin 22136 -> 0 bytes
www/img/linux-logo.png | Bin 6545 -> 0 bytes
www/img/osx-logo.png | Bin 6958 -> 0 bytes
www/img/windows-logo.png | Bin 8777 -> 0 bytes
www/index.html | 1 -
17 files changed, 385 deletions(-)
diff --git a/www/README.md b/www/README.md
deleted file mode 100644
index e28d216..0000000
--- a/www/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This folder contains the webpage rendered at https://gettor.torproject.org.
-This is a simple html file at the moment but should be a lektor project and moved
-somewhere else.
diff --git a/www/css/bootstrap.min.css b/www/css/bootstrap.min.css
deleted file mode 100644
index f898a1a..0000000
--- a/www/css/bootstrap.min.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * Bootstrap v3.3.2 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=fc8b2e3786f481875a12)
- * Config saved to config.json and https://gist.github.com/fc8b2e3786f481875a12
- *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em
}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}texta
rea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,*:before,*:after{background:transparent !important;color:#000 !important;-webkit-box-shadow:none !important;box-shadow:none !important;text-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff !important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table td,.table th{background-color:
#fff !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"
}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content
:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{co
ntent:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:befo
re{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094
"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizo
ntal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:
"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.gl
yphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sou
nd-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.gl
yphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237
"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\
e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:hover,a:focus{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all
.2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#777}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .s
mall,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}mark,.mark{background-color:#fcf8e3;padding:.2em}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-suc
cess:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-
height:1.42857143}dt{font-weight:bold}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #777}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reve
rse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.25)}kbd kbd{padding:0;fo
nt-size:100%;font-weight:bold;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-
sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75
%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-
4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.666666
67%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1, .col-md
-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.co
l-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg
-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg
-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[t
ype="file"]{display:block}input[type="range"]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0
8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type="search"]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type="date"],input[type="time"],input[type="datetime-local"],input[type="month"]{line-height:34px}input[type="date"].input-sm,input[type="time"].input-sm,input[type="datetime-local"].input-sm,input[type="month"].input-sm,.input-group-sm input[type="date"],.input-group-sm input[type="time"],.input-group-sm input[type="datetime-local"],.input-group-sm input[type="month"]{line-height:30px}input[type="date"].input-lg,input[type="time"].input-lg,input[type="datetime-lo
cal"].input-lg,input[type="month"].input-lg,.input-group-lg input[type="date"],.input-group-lg input[type="time"],.input-group-lg input[type="datetime-local"],.input-group-lg input[type="month"]{line-height:46px}}.form-group{margin-bottom:15px}.radio,.checkbox{position:relative;display:block;margin-top:10px;margin-bottom:10px}.radio label,.checkbox label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{position:absolute;margin-left:-20px;margin-top:4px \9}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:normal;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"].d
isabled,input[type="checkbox"].disabled,fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"]{cursor:not-allowed}.radio-inline.disabled,.checkbox-inline.disabled,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.radio.disabled label,.checkbox.disabled label,fieldset[disabled] .radio label,fieldset[disabled] .checkbox label{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-left:0;padding-right:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.form-group-sm .form-control{height:30px;line-height:30px}textarea.form-group-sm .form-control,select[multiple].form-group
-sm .form-control{height:auto}.form-group-sm .form-control-static{height:30px;padding:5px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.form-group-lg .form-control{height:46px;line-height:46px}textarea.form-group-lg .form-control,select[multiple].form-group-lg .form-control{height:auto}.form-group-lg .form-control-static{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback{width:46px;height:46px;line-h
eight:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline,.has-success.radio label,.has-success.checkbox label,.has-success.radio-inline label,.has-success.checkbox-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline,.
has-warning.radio label,.has-warning.checkbox label,.has-warning.radio-inline label,.has-warning.checkbox-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline,.has-error.radio label,.has-error.checkbox label,.has-error.radio-inline label,.has-error.checkbox-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px
rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn,.form-inline .input-group .form-control{width:auto}.form-inline .input-gr
oup>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .radio label,.form-inline .checkbox label{padding-left:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}@media (min-width:768px){.form-horizontal .control-label{text-align:right;margin-bottom:0;padding-top:7px}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padd
ing-top:14.333333px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn.active.focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus,.btn.focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;
opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default.focus,.btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled.focus,.btn-default[disabled].focus,fieldset[disabled] .btn-default.focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-c
olor:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary:hover,.btn-primary:focus,.btn-primary.focus,.btn-primary:active,.btn-primary.active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary:active,.btn-primary.active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled.focus,.btn-primary[disabled].focus,fieldset[disabled] .btn-primary.focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{ba
ckground-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success.focus,.btn-success:active,.btn-success.active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success:active,.btn-success.active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled.focus,.btn-success[disabled].focus,fieldset[disabled] .btn-success.focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .bt
n-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info.focus,.btn-info:active,.btn-info.active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info:active,.btn-info.active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled.focus,.btn-info[disabled].focus,fieldset[disabled] .btn-info.focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.b
tn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning.focus,.btn-warning:active,.btn-warning.active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled.focus,.btn-warning[disabled].focus,fieldset[disabled] .btn-warning.focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-
color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger.focus,.btn-danger:active,.btn-danger.active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled.focus,.btn-danger[disabled].focus,fieldset[disabled] .btn-danger.focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d4
3f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#337ab7;font-weight:normal;border-radius:0}.btn-link,.btn-link:active,.btn-link.active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#777;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="but
ton"].btn-block{width:100%}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#777;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;bor
der-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.
active>a:focus{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none;visibility:hidden}.tab-content>.active{display:block;visibility:visible}.nav-tabs .dropdown-menu{margin-to
p:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block !important;visibility:visible !important;height:auto !important;padding-bottom:0;overflow:visible !important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.navbar-fixed-top .navbar-collaps
e,.navbar-fixed-bottom .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{max-height:200px}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-heigh
t:20px;height:50px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open
.dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-a
lign:middle}.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn,.navbar-form .input-group .form-control{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .radio label,.navbar-form .checkbox label{padding-left:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radi
us:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-right-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}}@media (min-width:768px){.navbar-left{float:left !important}.navbar-right{float:right !important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-na
v>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-defau
lt .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:hover,.navbar-default .btn-link:focus{color:#333}.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:hover,.navbar-default .btn-link[disabled]:focus,fieldset[disabled] .navbar-default .btn-link:focus{color:#ccc}.navbar-inverse{background-color:#222;border-color:#08
0808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.na
vbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{c
olor:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:hover,.navbar-inverse .btn-link:focus{color:#fff}.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:hover,.navbar-inverse .btn-link[disabled]:focus,fieldset[disabled] .navbar-inverse .btn-link:focus{color:#444}.clearfix:before,.clearfix:after,.dl-horizontal dd:before,.dl-horizontal dd:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after{content:" ";display:table}.clearfix:after,.dl-horizontal dd:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.nav
:after,.navbar:after,.navbar-header:after,.navbar-collapse:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important;visibility:hidden !important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none !important}.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block{display:none !important}@media (max-width:767px){.visible-xs{display:block !important}table.visible-xs{display:table}tr.visible-xs{display:table-row !important}th.visibl
e-xs,td.visible-xs{display:table-cell !important}}@media (max-width:767px){.visible-xs-block{display:block !important}}@media (max-width:767px){.visible-xs-inline{display:inline !important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block !important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block !important}table.visible-sm{display:table}tr.visible-sm{display:table-row !important}th.visible-sm,td.visible-sm{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block !important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline !important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block !important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block !important}table.visible-md{display:table}tr.visible-md{display:table-row !important}th.visible-md,td.visible-md{display:table-cell !important}}
@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block !important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline !important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block !important}}@media (min-width:1200px){.visible-lg{display:block !important}table.visible-lg{display:table}tr.visible-lg{display:table-row !important}th.visible-lg,td.visible-lg{display:table-cell !important}}@media (min-width:1200px){.visible-lg-block{display:block !important}}@media (min-width:1200px){.visible-lg-inline{display:inline !important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block !important}}@media (max-width:767px){.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !impo
rtant}}.visible-print{display:none !important}@media print{.visible-print{display:block !important}table.visible-print{display:table}tr.visible-print{display:table-row !important}th.visible-print,td.visible-print{display:table-cell !important}}.visible-print-block{display:none !important}@media print{.visible-print-block{display:block !important}}.visible-print-inline{display:none !important}@media print{.visible-print-inline{display:inline !important}}.visible-print-inline-block{display:none !important}@media print{.visible-print-inline-block{display:inline-block !important}}@media print{.hidden-print{display:none !important}}
diff --git a/www/css/gettor.css b/www/css/gettor.css
deleted file mode 100644
index 520357a..0000000
--- a/www/css/gettor.css
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Fonts */
-@font-face {
- font-family: 'Lato';
- font-style: normal;
- font-weight: 400;
- src: local('Lato Regular'), local('Lato-Regular'), url('../fonts/lato-regular.woff') format('woff');
-}
-@font-face {
- font-family: 'Lato';
- font-style: normal;
- font-weight: 700;
- src: local('Lato Bold'), local('Lato-Bold'), url('../fonts/lato-bold.woff') format('woff');
-}
-@font-face {
- font-family: 'Lato';
- font-style: italic;
- font-weight: 400;
- src: local('Lato Italic'), local('Lato-Italic'), url('../fonts/lato-italic.woff') format('woff');
-}
-
-body {
- padding-bottom: 20px;
- /*background-color: #4ba027;*/
-}
-
-footer {
- color: #aaa;
-}
-
-a:link, a:visited {
- color: #AF02D7;
- text-decoration: none;
-}
-
-a:hover {
- color: #65007D;
-}
-
-#main {
- background-color: #fff;
- margin: 5% 0;
- font-family: "Lato";
- font-size: 16px;
- font-weight: lighter;
-}
-
-#main h2 {
- color: #8500A3;
-}
-
-#head-title {
- color: #fff !important;
- font-size: 23px;
-}
-
-#head-link {
- text-align: right;
-}
-
-#head-link a:link {
- color: #ccc;
-}
-
-#head-link a:hover {
- color: #fff;
- text-decoration: none;
-}
-
-.navbar {
- background-color: #770093 !important;
-}
-
-.pad-big-left {
- padding-left: 110px;
-}
-
-.pad-big-right {
- padding-right: 110px;
-}
-
-.big-link {
- font-size: 26px;
-}
diff --git a/www/fonts/glyphicons-halflings-regular.eot b/www/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index b93a495..0000000
Binary files a/www/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/www/fonts/glyphicons-halflings-regular.svg b/www/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 94fb549..0000000
--- a/www/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
-<font-face units-per-em="1200" ascent="960" descent="-240" />
-<missing-glyph horiz-adv-x="500" />
-<glyph horiz-adv-x="0" />
-<glyph horiz-adv-x="400" />
-<glyph unicode=" " />
-<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
-<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode=" " />
-<glyph unicode="¥" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
-<glyph unicode=" " horiz-adv-x="650" />
-<glyph unicode=" " horiz-adv-x="1300" />
-<glyph unicode=" " horiz-adv-x="650" />
-<glyph unicode=" " horiz-adv-x="1300" />
-<glyph unicode=" " horiz-adv-x="433" />
-<glyph unicode=" " horiz-adv-x="325" />
-<glyph unicode=" " horiz-adv-x="216" />
-<glyph unicode=" " horiz-adv-x="216" />
-<glyph unicode=" " horiz-adv-x="162" />
-<glyph unicode=" " horiz-adv-x="260" />
-<glyph unicode=" " horiz-adv-x="72" />
-<glyph unicode=" " horiz-adv-x="260" />
-<glyph unicode=" " horiz-adv-x="325" />
-<glyph unicode="€" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
-<glyph unicode="₽" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
-<glyph unicode="−" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="⌛" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
-<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="☁" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
-<glyph unicode="⛺" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
-<glyph unicode="✉" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
-<glyph unicode="✏" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
-<glyph unicode="" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
-<glyph unicode="" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
-<glyph unicode="" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
-<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
-<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
-<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
-<glyph unicode="" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
-<glyph unicode="" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
-<glyph unicode="" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 3
00h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
-<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
-<glyph unicode="" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
-<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
-<glyph unicode="" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
-<glyph unicode="" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
-<glyph unicode="" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
-<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
-<glyph unicode="" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
-<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
-<glyph unicode="" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-
450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
-<glyph unicode="" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
-<glyph unicode="" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
-<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
-<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
-<glyph unicode="" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
-<glyph unicode="" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
-<glyph unicode="" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
-<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
-<glyph unicode="" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
-<glyph unicode="" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
-<glyph unicode="" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
-<glyph unicode="" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
-<glyph unicode="" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
-<glyph unicode="" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
-<glyph unicode="" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
-<glyph unicode="" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200
h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
-<glyph unicode="" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
-<glyph unicode="" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
-<glyph unicode="" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
-<glyph unicode="" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
-<glyph unicode="" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
-<glyph unicode="" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
-<glyph unicode="" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
-<glyph unicode="" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
-<glyph unicode="" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
-<glyph unicode="" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
-<glyph unicode="" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
-<glyph unicode="" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
-<glyph unicode="" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
-<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
-<glyph unicode="" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
-<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
-<glyph unicode="" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
-<glyph unicode="" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
-<glyph unicode="" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
-<glyph unicode="" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
-<glyph unicode="" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
-<glyph unicode="" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
-<glyph unicode="" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
-<glyph unicode="" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
-<glyph unicode="" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
-<glyph unicode="" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
-<glyph unicode="" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
-<glyph unicode="" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
-<glyph unicode="" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
-<glyph unicode="" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
-<glyph unicode="" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
-<glyph unicode="" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
-<glyph unicode="" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
-<glyph unicode="" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
-<glyph unicode="" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
-<glyph unicode="" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
-<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
-<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
-<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
-<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-
3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
-<glyph unicode="" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
-<glyph unicode="" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
-<glyph unicode="" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
-<glyph unicode="" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
-<glyph unicode="" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
-<glyph unicode="" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
-<glyph unicode="" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
-<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
-<glyph unicode="" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
-<glyph unicode="" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
-<glyph unicode="" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
-<glyph unicode="" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
-<glyph unicode="" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
-<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
-<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
-<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
-<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
-<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
-<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
-<glyph unicode="" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
-<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
-<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
-<glyph unicode="" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
-<glyph unicode="" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
-<glyph unicode="" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
-<glyph unicode="" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
-<glyph unicode="" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
-<glyph unicode="" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
-<glyph unicode="" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
-<glyph unicode="" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
-<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
-<glyph unicode="" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
-<glyph unicode="" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
-<glyph unicode="" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
-<glyph unicode="" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
-<glyph unicode="" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
-<glyph unicode="" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
-<glyph unicode="" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
-<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
-<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
-<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
-<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
-<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
-<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
-<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
-<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
-<glyph unicode="" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
-<glyph unicode="" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
-<glyph unicode="" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
-<glyph unicode="" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.
5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
-<glyph unicode="" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
-<glyph unicode="" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
-<glyph unicode="" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
-<glyph unicode="" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
-<glyph unicode="" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17
.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
-<glyph unicode="" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
-<glyph unicode="" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
-<glyph unicode="" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
-<glyph unicode="" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
-<glyph unicode="" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
-<glyph unicode="" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
-<glyph unicode="" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
-<glyph unicode="" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
-<glyph unicode="" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
-<glyph unicode="" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
-<glyph unicode="" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
-<glyph unicode="" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
-<glyph unicode="" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
-<glyph unicode="" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
-<glyph unicode="" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
-<glyph unicode="" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
-<glyph unicode="" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
-<glyph unicode="" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
-<glyph unicode="" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
-<glyph unicode="" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
-<glyph unicode="" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
-<glyph unicode="" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
-<glyph unicode="" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
-<glyph unicode="" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
-<glyph unicode="" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
-<glyph unicode="" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
-<glyph unicode="" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
-<glyph unicode="" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
-<glyph unicode="" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
-<glyph unicode="🔑" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
-<glyph unicode="🚪" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
-</font>
-</defs></svg>
\ No newline at end of file
diff --git a/www/fonts/glyphicons-halflings-regular.ttf b/www/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index 1413fc6..0000000
Binary files a/www/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/www/fonts/glyphicons-halflings-regular.woff b/www/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 9e61285..0000000
Binary files a/www/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/www/fonts/glyphicons-halflings-regular.woff2 b/www/fonts/glyphicons-halflings-regular.woff2
deleted file mode 100644
index 64539b5..0000000
Binary files a/www/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ
diff --git a/www/fonts/lato-bold.woff b/www/fonts/lato-bold.woff
deleted file mode 100644
index 4b17251..0000000
Binary files a/www/fonts/lato-bold.woff and /dev/null differ
diff --git a/www/fonts/lato-italic.woff b/www/fonts/lato-italic.woff
deleted file mode 100644
index 09cc379..0000000
Binary files a/www/fonts/lato-italic.woff and /dev/null differ
diff --git a/www/fonts/lato-regular.woff b/www/fonts/lato-regular.woff
deleted file mode 100644
index f48e484..0000000
Binary files a/www/fonts/lato-regular.woff and /dev/null differ
diff --git a/www/img/android-logo.png b/www/img/android-logo.png
deleted file mode 100644
index 624384e..0000000
Binary files a/www/img/android-logo.png and /dev/null differ
diff --git a/www/img/gettor-logo.png b/www/img/gettor-logo.png
deleted file mode 100644
index 525d8d0..0000000
Binary files a/www/img/gettor-logo.png and /dev/null differ
diff --git a/www/img/linux-logo.png b/www/img/linux-logo.png
deleted file mode 100644
index f6d6fd9..0000000
Binary files a/www/img/linux-logo.png and /dev/null differ
diff --git a/www/img/osx-logo.png b/www/img/osx-logo.png
deleted file mode 100644
index 1e19dca..0000000
Binary files a/www/img/osx-logo.png and /dev/null differ
diff --git a/www/img/windows-logo.png b/www/img/windows-logo.png
deleted file mode 100644
index 01f273d..0000000
Binary files a/www/img/windows-logo.png and /dev/null differ
diff --git a/www/index.html b/www/index.html
deleted file mode 100644
index a4d7af8..0000000
--- a/www/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE html><html lang="en"> <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> <title>GetTor | Download Tor Browser for Windows, Linux, OS X</title> <link href="css/bootstrap.min.css" rel="stylesheet"> <link href="css/gettor.css" rel="stylesheet"> </head> <body> <nav class="navbar navbar-inverse navbar-fixed-top"> <div class="container"> <div class="navbar-header"> <span class="navbar-brand"> <span id="head-title">GetTor - Github mirror</span> </span> </div> <div class="navbar-right"> <span class="navbar-brand"> <span id="head-link"><a href="https://www.torproject.org">The Tor Project</a></span> </span>
</div> </div> </nav> <div id="main"> <div class="container text-justify"> <!-- <div class="row lang well"> Supported languages: <strong>English</strong>, <a href="fa/index.html">Farsi</a>, <a href="zh/index.html">Chinese</a>, <a href="tr/index.html">Turkish</a>. </div>--> <br /> <div class="row"> <div class="col-lg-2"> <img src="img/gettor-logo.png"> </div> <div class="col-lg-10" id="description"> <p> <h1>Download Tor Browser</h1> <hr /> Below you will find links to download the latest version of Tor Browser (5.5.2)<!-- and Orbot (%ORBOT_VERSION%) -->. </p> </div> </div> <br /> <div class="row"> <div class="col-lg-5"> <h2>Direct downloads</h2>
<!-- <div class="row well"> <div class="col-lg-2"> <img src="img/android-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <a href="#" class="big-link">Tor Browser for Android</a><br />(<a href="#">signature file</a>) </div> </div> --> <div class="row well"> <div class="col-lg-2"> <img src="img/windows-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <span class="big-link">Tor Browser for Windows</span><br /> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">English</a>, <a href="https://github.com/TheTorP
roject/gettorbrowser/releases/download/v5.5.2/torbrowser-install-5.5.2_fa.exe">Farsi</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">Chinese</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">Turkish</a> </div> </div> <div class="row well"> <div class="col-lg-2"> <img src="img/osx-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <span class="big-link">Tor Browser for OS X</span><br /> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/Tor…">English</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/Tor…">F
arsi</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/Tor…">Chinese</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/Tor…">Turkish</a> </div> </div> <div class="row well"> <div class="col-lg-2"> <img src="img/linux-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <span class="big-link">Tor Browser for Linux 32-bit</span><br /> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">English</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">Farsi</a>, <a href="https://github.com/TheTorProject/gettorbrow
ser/releases/download/v5.5.2/tor-browser-linux32-5.5.2_zh-CN.tar.xz">Chinese</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">Turkish</a> </div> </div> <div class="row well"> <div class="col-lg-2"> <img src="img/linux-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <span class="big-link">Tor Browser for Linux 64-bit</span><br /> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">English</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">Farsi</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…
.5.2_zh-CN.tar.xz">Chinese</a>, <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">Turkish</a> </div> </div> </div> <div class="col-lg-5 col-lg-offset-2"> <h2>Alternative downloads</h2> <div class="row well"> <span class="mid-title">Get links via Email</span>: You can send an email to <a href="mailto:gettor@torproject.org">gettor(a)torproject.org</a>. Send the word <strong>help</strong> in the body of the message to learn how to interact with it. </div> <div class="row well"> <span class="mid-title">Get links via XMPP</span>: You can send a message to <a href="#">get_tor(a)riseup.net</a> using your favorite XMPP client. Simply enter <strong>help</strong> in an XMPP message to learn h
ow to interact with it. </div> <div class="row well"> <span class="mid-title">Get links via Twitter</span>: You can send a direct message to <a href="https://twitter.com/get_tor">@get_tor</a> account (you don't need to follow). Send the word <strong>help</strong> in a direct message to learn how to interact with it. </div> <h2>Get bridges</h2> <div class="row well"> Bridges are Tor relays that help you circumvent censorship. If you suspect your access to the Tor network is being blocked, you may want to use bridges. You can get bridges from the <a href="https://bridges.torproject.org">HTTP distributor</a>. You can also send an email to <a href="mailto:bridges@torproject.org">bridges(a)torproject.org</a> <span class="note">
(please note that you must send the email using an address from one of the following email providers: riseup, gmail or yahoo).</span> </div> </div> </div> </div> </div> <hr /> <footer class="container"> <p>© The Tor Project 2016</p> </footer> </div> </body></html>
\ No newline at end of file
1
0
commit 138c9152287e171d1e6ecc4910aa101f22c92d55
Author: Cecylia Bocovich <cohosh(a)torproject.org>
Date: Mon Apr 13 16:44:39 2020 -0400
Remove old upload documentation
---
doc/UPLOAD-DROPBOX | 20 --------------------
doc/UPLOAD-GOOGLE-DRIVE | 21 ---------------------
2 files changed, 41 deletions(-)
diff --git a/doc/UPLOAD-DROPBOX b/doc/UPLOAD-DROPBOX
deleted file mode 100644
index dc0728a..0000000
--- a/doc/UPLOAD-DROPBOX
+++ /dev/null
@@ -1,20 +0,0 @@
-1) Get the current repo:
-
-$ git clone https://github.com/ileiva/gettor.git
-
-2) Check if you have Dropbox and GnuPG Python modules. If not, install them:
-
-$ pip install dropbox gnupg
-
-4) Get the PGP key that signs the Tor Browser Bundles.
-
-3) Change general configuration and account info in dropbox.cfg.
-
-3) Run the script:
-
-$ python dropbox.py
-
-If everything works fine, you should see a dropbox.links file inside the
-'providers' directory. The script will take the files on upload_dir
-(dropbox.cfg) that end up on .xz and .xz.asc respectively. A script for
-getting the latest bundles from dist.tp.o is pending.
\ No newline at end of file
diff --git a/doc/UPLOAD-GOOGLE-DRIVE b/doc/UPLOAD-GOOGLE-DRIVE
deleted file mode 100644
index 0ab505e..0000000
--- a/doc/UPLOAD-GOOGLE-DRIVE
+++ /dev/null
@@ -1,21 +0,0 @@
-1) Clone into the latest version of gettor:
-
-$ git clone https://github.com/ilv/gettor.git
-
-2) Get the PGP key that signs the Tor Browser Bundle
-
-2) Visit https://console.developers.google.com//start/api?id=drive&credential=client… and follow OAUTH2 process to get client ID and client secret for 'other' desktop application.
-
-3) Edit drive.cfg to with new client-id and secret. Leave refresh_token empty.
-
-4) Install the google drive API python client:
-
-$ pip install --upgrade google-api-python-client
-
-5) Run the script:
-
-$ python bundles2drive.py
-
-The first time the script is run, you will have to authorize it through a web browser. You will be prompted with a URL. Once that is done, a refresh token will be stored locally so that re-authorzing is unnesaccary.
-
-The script will then look for files in upload_dir (as specified in drive.cfg) and upload them to google drive. If no errors occur, it will then add formatted links and hash information to the drive.links file.
1
0