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

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by teor＠torproject.org 12 Nov '19

12 Nov '19

commit 0cfb7f6ce715d1947029c7dd92e6fd79868dc599 Merge: 111f988b5 9be51e8a8 Author: teor <teor(a)torproject.org> Date: Tue Nov 12 10:09:57 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32295 | 3 ++ src/lib/confmgt/type_defs.c | 39 +++++++++++------ src/lib/confmgt/typedvar.c | 11 ++--- src/lib/confmgt/typedvar.h | 2 +- src/lib/confmgt/var_type_def_st.h | 5 ++- src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc | 68 ++++++++++++++++++++++++++++++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc | 2 + 9 files changed, 110 insertions(+), 20 deletions(-)

1 0

[tor/maint-0.4.2] config: Log the option name when skipping an obsolete option
by teor＠torproject.org 12 Nov '19

12 Nov '19

commit 2ee04fc309b8f4fb3c34271587ab47addaff32ae Author: teor <teor(a)torproject.org> Date: Mon Nov 11 11:59:50 2019 +1000 config: Log the option name when skipping an obsolete option This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later is in 32404. Fixes bug 32295; bugfix on 0.4.2.1-alpha. --- changes/bug32295 | 3 +++ src/lib/confmgt/type_defs.c | 39 ++++++++++++++++++++++++++------------- src/lib/confmgt/typedvar.c | 11 ++++++----- src/lib/confmgt/typedvar.h | 2 +- src/lib/confmgt/var_type_def_st.h | 5 ++++- 5 files changed, 40 insertions(+), 20 deletions(-) diff --git a/changes/bug32295 b/changes/bug32295 new file mode 100644 index 000000000..e5e5a4399 --- /dev/null +++ b/changes/bug32295 @@ -0,0 +1,3 @@ + o Minor bugfixes (configuration): + - Log the option name when skipping an obsolete option. + Fixes bug 32295; bugfix on 0.4.2.1-alpha. diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c index ed930fb02..5066e1226 100644 --- a/src/lib/confmgt/type_defs.c +++ b/src/lib/confmgt/type_defs.c @@ -52,10 +52,11 @@ static int string_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; (void)errmsg; + (void)key; char **p = (char**)target; *p = tor_strdup(value); return 0; @@ -106,8 +107,10 @@ static const int_parse_params_t INT_PARSE_POSINT = { }; static int -int_parse(void *target, const char *value, char **errmsg, const void *params) +int_parse(void *target, const char *value, char **errmsg, const void *params, + const char *key) { + (void)key; const int_parse_params_t *pp; if (params) { pp = params; @@ -169,10 +172,11 @@ static const var_type_fns_t int_fns = { static int uint64_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; (void)errmsg; + (void)key; uint64_t *p = target; int ok=0; *p = tor_parse_uint64(value, 10, 0, UINT64_MAX, &ok, NULL); @@ -219,8 +223,9 @@ static const var_type_fns_t uint64_fns = { static int units_parse_u64(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { + (void)key; const unit_table_t *table = params; tor_assert(table); uint64_t *v = (uint64_t*)target; @@ -235,8 +240,9 @@ units_parse_u64(void *target, const char *value, char **errmsg, static int units_parse_int(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { + (void)key; const unit_table_t *table = params; tor_assert(table); int *v = (int*)target; @@ -283,10 +289,11 @@ static const var_type_fns_t interval_fns = { static int double_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; (void)errmsg; + (void)key; double *v = (double*)target; char *endptr=NULL; errno = 0; @@ -347,8 +354,9 @@ typedef struct enumeration_table_t { static int enum_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { + (void)key; const enumeration_table_t *table = params; int *p = (int *)target; for (; table->name; ++table) { @@ -422,9 +430,10 @@ static const var_type_fns_t enum_fns = { static int time_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void) params; + (void) key; time_t *p = target; if (parse_iso_time(value, p) < 0) { tor_asprintf(errmsg, "Invalid time %s", escaped(value)); @@ -466,10 +475,11 @@ static const var_type_fns_t time_fns = { static int csv_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; (void)errmsg; + (void)key; smartlist_t **sl = (smartlist_t**)target; *sl = smartlist_new(); smartlist_split_string(*sl, value, ",", @@ -515,7 +525,7 @@ static const var_type_fns_t csv_fns = { static int legacy_csv_interval_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; /* We used to have entire smartlists here. But now that all of our @@ -529,7 +539,7 @@ legacy_csv_interval_parse(void *target, const char *value, char **errmsg, val = tmp; } - int rv = units_parse_int(target, val, errmsg, &time_units); + int rv = units_parse_int(target, val, errmsg, &time_units, key); tor_free(tmp); return rv; } @@ -693,14 +703,17 @@ static const var_type_fns_t linelist_s_fns = { static int ignore_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)target; (void)value; (void)errmsg; (void)params; // XXXX move this to a higher level, once such a level exists. - log_warn(LD_GENERAL, "Skipping obsolete configuration option."); + log_warn(LD_GENERAL, "Skipping obsolete configuration option%s%s%s", + key && *key ? " \"" : "", + key && *key ? key : "", + key && *key ? "\"." : "."); return 0; } diff --git a/src/lib/confmgt/typedvar.c b/src/lib/confmgt/typedvar.c index 219a2d15b..ce11a6937 100644 --- a/src/lib/confmgt/typedvar.c +++ b/src/lib/confmgt/typedvar.c @@ -33,7 +33,8 @@ /** * Try to parse a string in <b>value</b> that encodes an object of the type - * defined by <b>def</b>. + * defined by <b>def</b>. If not NULL, <b>key</b> is the name of the option, + * which may be used for logging. * * On success, adjust the lvalue pointed to by <b>target</b> to hold that * value, and return 0. On failure, set *<b>errmsg</b> to a newly allocated @@ -41,7 +42,7 @@ **/ int typed_var_assign(void *target, const char *value, char **errmsg, - const var_type_def_t *def) + const var_type_def_t *def, const char *key) { if (BUG(!def)) return -1; // LCOV_EXCL_LINE @@ -49,7 +50,7 @@ typed_var_assign(void *target, const char *value, char **errmsg, typed_var_free(target, def); tor_assert(def->fns->parse); - return def->fns->parse(target, value, errmsg, def->params); + return def->fns->parse(target, value, errmsg, def->params, key); } /** @@ -75,7 +76,7 @@ typed_var_kvassign(void *target, const config_line_t *line, return def->fns->kv_parse(target, line, errmsg, def->params); } - return typed_var_assign(target, line->value, errmsg, def); + return typed_var_assign(target, line->value, errmsg, def, line->key); } /** @@ -158,7 +159,7 @@ typed_var_copy(void *dest, const void *src, const var_type_def_t *def) return 0; } char *err = NULL; - int rv = typed_var_assign(dest, enc, &err, def); + int rv = typed_var_assign(dest, enc, &err, def, NULL); if (BUG(rv < 0)) { // LCOV_EXCL_START log_warn(LD_BUG, "Encoded value %s was not parseable as a %s: %s", diff --git a/src/lib/confmgt/typedvar.h b/src/lib/confmgt/typedvar.h index 22f2e3c58..438261383 100644 --- a/src/lib/confmgt/typedvar.h +++ b/src/lib/confmgt/typedvar.h @@ -21,7 +21,7 @@ typedef struct var_type_fns_t var_type_fns_t; typedef struct var_type_def_t var_type_def_t; int typed_var_assign(void *target, const char *value, char **errmsg, - const var_type_def_t *def); + const var_type_def_t *def, const char *key); void typed_var_free(void *target, const var_type_def_t *def); char *typed_var_encode(const void *value, const var_type_def_t *def); int typed_var_copy(void *dest, const void *src, const var_type_def_t *def); diff --git a/src/lib/confmgt/var_type_def_st.h b/src/lib/confmgt/var_type_def_st.h index 2bf3d37ca..aa9ded39e 100644 --- a/src/lib/confmgt/var_type_def_st.h +++ b/src/lib/confmgt/var_type_def_st.h @@ -52,9 +52,12 @@ struct var_type_fns_t { * type. On success, adjust the lvalue pointed to by <b>target</b> to hold * that value, and return 0. On failure, set *<b>errmsg</b> to a newly * allocated string holding an error message, and return -1. + * + * If not NULL, <b>key</b> is the name of the option, which may be used for + * logging. **/ int (*parse)(void *target, const char *value, char **errmsg, - const void *params); + const void *params, const char *key); /** * Try to parse a single line from the head of<b>line</b> that encodes * an object of this type. On success and failure, behave as in the parse()

1 0

[tor/maint-0.4.2] test/parseconf: Add tests for ignored options
by teor＠torproject.org 12 Nov '19

12 Nov '19

commit 9be51e8a8e0663a60359f720664defdb4d1d593a Author: teor <teor(a)torproject.org> Date: Mon Nov 11 12:01:31 2019 +1000 test/parseconf: Add tests for ignored options These tests will also pass on 0.4.3, with the original implementation, and with the new implementation in 32404. Part of 32295 and 32404. --- src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc | 68 ++++++++++++++++++++++++++++++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc | 2 + 4 files changed, 70 insertions(+) diff --git a/src/test/conf_examples/obsolete_1/expected b/src/test/conf_examples/obsolete_1/expected new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/obsolete_1/torrc b/src/test/conf_examples/obsolete_1/torrc new file mode 100644 index 000000000..3cd9a6d77 --- /dev/null +++ b/src/test/conf_examples/obsolete_1/torrc @@ -0,0 +1,68 @@ +# These options are obsolete as of 0.4.2 +AllowDotExit +AllowInvalidNodes +AllowSingleHopCircuits +AllowSingleHopExits +AlternateHSAuthority +AuthDirBadDir +AuthDirBadDirCCs +AuthDirRejectUnlisted +AuthDirListBadDirs +AuthDirMaxServersPerAuthAddr +CircuitIdleTimeout +ControlListenAddress +DirListenAddress +DisableIOCP +DisableV2DirectoryInfo_ +DynamicDHGroups +DNSListenAddress +TestingEnableTbEmptyEvent +ExcludeSingleHopRelays +FallbackNetworkstatusFile +FastFirstHopPK +FetchV2Networkstatus +Group +HidServDirectoryV2 +CloseHSClientCircuitsImmediatelyOnTimeout +CloseHSServiceRendCircuitsImmediatelyOnTimeout +MaxOnionsPending +NamingAuthoritativeDirectory +NATDListenAddress +PredictedPortsRelevanceTime +WarnUnsafeSocks +ORListenAddress +PathBiasDisableRate +PathBiasScaleFactor +PathBiasMultFactor +PathBiasUseCloseCounts +PortForwarding +PortForwardingHelper +PreferTunneledDirConns +RecommendedPackages +RunTesting +SchedulerLowWaterMark__ +SchedulerHighWaterMark__ +SchedulerMaxFlushCells__ +SocksListenAddress +StrictEntryNodes +StrictExitNodes +Support022HiddenServices +Tor2webMode +Tor2webRendezvousPoints +TLSECGroup +TransListenAddress +TunnelDirConns +UseEntryGuardsAsDirGuards +UseNTorHandshake +UserspaceIOCPBuffers +V1AuthoritativeDirectory +V2AuthoritativeDirectory +VoteOnHidServDirectoriesV2 +UseFilteringSSLBufferevents +__UseFilteringSSLBufferevents +TestingConsensusMaxDownloadTries +ClientBootstrapConsensusMaxDownloadTries +ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries +TestingDescriptorMaxDownloadTries +TestingMicrodescMaxDownloadTries +TestingCertMaxDownloadTries diff --git a/src/test/conf_examples/obsolete_2/expected b/src/test/conf_examples/obsolete_2/expected new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/obsolete_2/torrc b/src/test/conf_examples/obsolete_2/torrc new file mode 100644 index 000000000..4f78d4762 --- /dev/null +++ b/src/test/conf_examples/obsolete_2/torrc @@ -0,0 +1,2 @@ +# This option has been obsolete for some time +AllowDotExit

1 0

[tor/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 12 Nov '19

12 Nov '19

commit 233ccef6d878253ee4f0cfa4610577101b68e6c6 Merge: 3d6ec40e6 9be51e8a8 Author: teor <teor(a)torproject.org> Date: Tue Nov 12 10:10:01 2019 +1000 Merge branch 'maint-0.4.2' src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc | 68 ++++++++++++++++++++++++++++++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc | 2 + 4 files changed, 70 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 12 Nov '19

12 Nov '19

commit 3d6ec40e6a0ad2658a49a1b02bbf93f1a731fe73 Merge: 3d1a7d7dd 2ee04fc30 Author: teor <teor(a)torproject.org> Date: Tue Nov 12 10:07:46 2019 +1000 Merge branch 'maint-0.4.2' "git merge --strategy ours", because: * 32295 is a quick fix for 0.4.2 only * 32404 has a better implementation for master

1 0

[tor/master] config: Log the option name when skipping an obsolete option
by teor＠torproject.org 12 Nov '19

12 Nov '19

commit 2ee04fc309b8f4fb3c34271587ab47addaff32ae Author: teor <teor(a)torproject.org> Date: Mon Nov 11 11:59:50 2019 +1000 config: Log the option name when skipping an obsolete option This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later is in 32404. Fixes bug 32295; bugfix on 0.4.2.1-alpha. --- changes/bug32295 | 3 +++ src/lib/confmgt/type_defs.c | 39 ++++++++++++++++++++++++++------------- src/lib/confmgt/typedvar.c | 11 ++++++----- src/lib/confmgt/typedvar.h | 2 +- src/lib/confmgt/var_type_def_st.h | 5 ++++- 5 files changed, 40 insertions(+), 20 deletions(-) diff --git a/changes/bug32295 b/changes/bug32295 new file mode 100644 index 000000000..e5e5a4399 --- /dev/null +++ b/changes/bug32295 @@ -0,0 +1,3 @@ + o Minor bugfixes (configuration): + - Log the option name when skipping an obsolete option. + Fixes bug 32295; bugfix on 0.4.2.1-alpha. diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c index ed930fb02..5066e1226 100644 --- a/src/lib/confmgt/type_defs.c +++ b/src/lib/confmgt/type_defs.c @@ -52,10 +52,11 @@ static int string_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; (void)errmsg; + (void)key; char **p = (char**)target; *p = tor_strdup(value); return 0; @@ -106,8 +107,10 @@ static const int_parse_params_t INT_PARSE_POSINT = { }; static int -int_parse(void *target, const char *value, char **errmsg, const void *params) +int_parse(void *target, const char *value, char **errmsg, const void *params, + const char *key) { + (void)key; const int_parse_params_t *pp; if (params) { pp = params; @@ -169,10 +172,11 @@ static const var_type_fns_t int_fns = { static int uint64_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; (void)errmsg; + (void)key; uint64_t *p = target; int ok=0; *p = tor_parse_uint64(value, 10, 0, UINT64_MAX, &ok, NULL); @@ -219,8 +223,9 @@ static const var_type_fns_t uint64_fns = { static int units_parse_u64(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { + (void)key; const unit_table_t *table = params; tor_assert(table); uint64_t *v = (uint64_t*)target; @@ -235,8 +240,9 @@ units_parse_u64(void *target, const char *value, char **errmsg, static int units_parse_int(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { + (void)key; const unit_table_t *table = params; tor_assert(table); int *v = (int*)target; @@ -283,10 +289,11 @@ static const var_type_fns_t interval_fns = { static int double_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; (void)errmsg; + (void)key; double *v = (double*)target; char *endptr=NULL; errno = 0; @@ -347,8 +354,9 @@ typedef struct enumeration_table_t { static int enum_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { + (void)key; const enumeration_table_t *table = params; int *p = (int *)target; for (; table->name; ++table) { @@ -422,9 +430,10 @@ static const var_type_fns_t enum_fns = { static int time_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void) params; + (void) key; time_t *p = target; if (parse_iso_time(value, p) < 0) { tor_asprintf(errmsg, "Invalid time %s", escaped(value)); @@ -466,10 +475,11 @@ static const var_type_fns_t time_fns = { static int csv_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; (void)errmsg; + (void)key; smartlist_t **sl = (smartlist_t**)target; *sl = smartlist_new(); smartlist_split_string(*sl, value, ",", @@ -515,7 +525,7 @@ static const var_type_fns_t csv_fns = { static int legacy_csv_interval_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)params; /* We used to have entire smartlists here. But now that all of our @@ -529,7 +539,7 @@ legacy_csv_interval_parse(void *target, const char *value, char **errmsg, val = tmp; } - int rv = units_parse_int(target, val, errmsg, &time_units); + int rv = units_parse_int(target, val, errmsg, &time_units, key); tor_free(tmp); return rv; } @@ -693,14 +703,17 @@ static const var_type_fns_t linelist_s_fns = { static int ignore_parse(void *target, const char *value, char **errmsg, - const void *params) + const void *params, const char *key) { (void)target; (void)value; (void)errmsg; (void)params; // XXXX move this to a higher level, once such a level exists. - log_warn(LD_GENERAL, "Skipping obsolete configuration option."); + log_warn(LD_GENERAL, "Skipping obsolete configuration option%s%s%s", + key && *key ? " \"" : "", + key && *key ? key : "", + key && *key ? "\"." : "."); return 0; } diff --git a/src/lib/confmgt/typedvar.c b/src/lib/confmgt/typedvar.c index 219a2d15b..ce11a6937 100644 --- a/src/lib/confmgt/typedvar.c +++ b/src/lib/confmgt/typedvar.c @@ -33,7 +33,8 @@ /** * Try to parse a string in <b>value</b> that encodes an object of the type - * defined by <b>def</b>. + * defined by <b>def</b>. If not NULL, <b>key</b> is the name of the option, + * which may be used for logging. * * On success, adjust the lvalue pointed to by <b>target</b> to hold that * value, and return 0. On failure, set *<b>errmsg</b> to a newly allocated @@ -41,7 +42,7 @@ **/ int typed_var_assign(void *target, const char *value, char **errmsg, - const var_type_def_t *def) + const var_type_def_t *def, const char *key) { if (BUG(!def)) return -1; // LCOV_EXCL_LINE @@ -49,7 +50,7 @@ typed_var_assign(void *target, const char *value, char **errmsg, typed_var_free(target, def); tor_assert(def->fns->parse); - return def->fns->parse(target, value, errmsg, def->params); + return def->fns->parse(target, value, errmsg, def->params, key); } /** @@ -75,7 +76,7 @@ typed_var_kvassign(void *target, const config_line_t *line, return def->fns->kv_parse(target, line, errmsg, def->params); } - return typed_var_assign(target, line->value, errmsg, def); + return typed_var_assign(target, line->value, errmsg, def, line->key); } /** @@ -158,7 +159,7 @@ typed_var_copy(void *dest, const void *src, const var_type_def_t *def) return 0; } char *err = NULL; - int rv = typed_var_assign(dest, enc, &err, def); + int rv = typed_var_assign(dest, enc, &err, def, NULL); if (BUG(rv < 0)) { // LCOV_EXCL_START log_warn(LD_BUG, "Encoded value %s was not parseable as a %s: %s", diff --git a/src/lib/confmgt/typedvar.h b/src/lib/confmgt/typedvar.h index 22f2e3c58..438261383 100644 --- a/src/lib/confmgt/typedvar.h +++ b/src/lib/confmgt/typedvar.h @@ -21,7 +21,7 @@ typedef struct var_type_fns_t var_type_fns_t; typedef struct var_type_def_t var_type_def_t; int typed_var_assign(void *target, const char *value, char **errmsg, - const var_type_def_t *def); + const var_type_def_t *def, const char *key); void typed_var_free(void *target, const var_type_def_t *def); char *typed_var_encode(const void *value, const var_type_def_t *def); int typed_var_copy(void *dest, const void *src, const var_type_def_t *def); diff --git a/src/lib/confmgt/var_type_def_st.h b/src/lib/confmgt/var_type_def_st.h index 2bf3d37ca..aa9ded39e 100644 --- a/src/lib/confmgt/var_type_def_st.h +++ b/src/lib/confmgt/var_type_def_st.h @@ -52,9 +52,12 @@ struct var_type_fns_t { * type. On success, adjust the lvalue pointed to by <b>target</b> to hold * that value, and return 0. On failure, set *<b>errmsg</b> to a newly * allocated string holding an error message, and return -1. + * + * If not NULL, <b>key</b> is the name of the option, which may be used for + * logging. **/ int (*parse)(void *target, const char *value, char **errmsg, - const void *params); + const void *params, const char *key); /** * Try to parse a single line from the head of<b>line</b> that encodes * an object of this type. On success and failure, behave as in the parse()

1 0

[tor/master] test/parseconf: Add tests for ignored options
by teor＠torproject.org 12 Nov '19

12 Nov '19

commit 9be51e8a8e0663a60359f720664defdb4d1d593a Author: teor <teor(a)torproject.org> Date: Mon Nov 11 12:01:31 2019 +1000 test/parseconf: Add tests for ignored options These tests will also pass on 0.4.3, with the original implementation, and with the new implementation in 32404. Part of 32295 and 32404. --- src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc | 68 ++++++++++++++++++++++++++++++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc | 2 + 4 files changed, 70 insertions(+) diff --git a/src/test/conf_examples/obsolete_1/expected b/src/test/conf_examples/obsolete_1/expected new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/obsolete_1/torrc b/src/test/conf_examples/obsolete_1/torrc new file mode 100644 index 000000000..3cd9a6d77 --- /dev/null +++ b/src/test/conf_examples/obsolete_1/torrc @@ -0,0 +1,68 @@ +# These options are obsolete as of 0.4.2 +AllowDotExit +AllowInvalidNodes +AllowSingleHopCircuits +AllowSingleHopExits +AlternateHSAuthority +AuthDirBadDir +AuthDirBadDirCCs +AuthDirRejectUnlisted +AuthDirListBadDirs +AuthDirMaxServersPerAuthAddr +CircuitIdleTimeout +ControlListenAddress +DirListenAddress +DisableIOCP +DisableV2DirectoryInfo_ +DynamicDHGroups +DNSListenAddress +TestingEnableTbEmptyEvent +ExcludeSingleHopRelays +FallbackNetworkstatusFile +FastFirstHopPK +FetchV2Networkstatus +Group +HidServDirectoryV2 +CloseHSClientCircuitsImmediatelyOnTimeout +CloseHSServiceRendCircuitsImmediatelyOnTimeout +MaxOnionsPending +NamingAuthoritativeDirectory +NATDListenAddress +PredictedPortsRelevanceTime +WarnUnsafeSocks +ORListenAddress +PathBiasDisableRate +PathBiasScaleFactor +PathBiasMultFactor +PathBiasUseCloseCounts +PortForwarding +PortForwardingHelper +PreferTunneledDirConns +RecommendedPackages +RunTesting +SchedulerLowWaterMark__ +SchedulerHighWaterMark__ +SchedulerMaxFlushCells__ +SocksListenAddress +StrictEntryNodes +StrictExitNodes +Support022HiddenServices +Tor2webMode +Tor2webRendezvousPoints +TLSECGroup +TransListenAddress +TunnelDirConns +UseEntryGuardsAsDirGuards +UseNTorHandshake +UserspaceIOCPBuffers +V1AuthoritativeDirectory +V2AuthoritativeDirectory +VoteOnHidServDirectoriesV2 +UseFilteringSSLBufferevents +__UseFilteringSSLBufferevents +TestingConsensusMaxDownloadTries +ClientBootstrapConsensusMaxDownloadTries +ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries +TestingDescriptorMaxDownloadTries +TestingMicrodescMaxDownloadTries +TestingCertMaxDownloadTries diff --git a/src/test/conf_examples/obsolete_2/expected b/src/test/conf_examples/obsolete_2/expected new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/obsolete_2/torrc b/src/test/conf_examples/obsolete_2/torrc new file mode 100644 index 000000000..4f78d4762 --- /dev/null +++ b/src/test/conf_examples/obsolete_2/torrc @@ -0,0 +1,2 @@ +# This option has been obsolete for some time +AllowDotExit

1 0

[snowflake/master] Stop using custom websocket library in server
by arlo＠torproject.org 11 Nov '19

11 Nov '19

commit c417fd5599c5d39951c606856c69a9f05941afd3 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Oct 16 21:00:13 2019 -0400 Stop using custom websocket library in server Trac: 31028 --- .travis.yml | 2 +- server/server.go | 88 +++++++++++++++++++++++++++++++++----------------------- 2 files changed, 53 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ed48bb..2f02f74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ install: - go get -u github.com/keroserene/go-webrtc - go get -u github.com/pion/webrtc - go get -u github.com/dchest/uniuri + - go get -u github.com/gorilla/websocket - go get -u git.torproject.org/pluggable-transports/goptlib.git - - go get -u git.torproject.org/pluggable-transports/websocket.git/websocket - go get -u google.golang.org/appengine - go get -u golang.org/x/crypto/acme/autocert - go get -u golang.org/x/net/http2 diff --git a/server/server.go b/server/server.go index b1b566a..d111fce 100644 --- a/server/server.go +++ b/server/server.go @@ -21,7 +21,7 @@ import ( pt "git.torproject.org/pluggable-transports/goptlib.git" "git.torproject.org/pluggable-transports/snowflake.git/common/safelog" - "git.torproject.org/pluggable-transports/websocket.git/websocket" + "github.com/gorilla/websocket" "golang.org/x/crypto/acme/autocert" "golang.org/x/net/http2" ) @@ -53,50 +53,60 @@ additional HTTP listener on port 80 to work with ACME. // An abstraction that makes an underlying WebSocket connection look like an // io.ReadWriteCloser. type webSocketConn struct { - Ws *websocket.WebSocket - messageBuf []byte + Ws *websocket.Conn + r io.Reader } // Implements io.Reader. func (conn *webSocketConn) Read(b []byte) (n int, err error) { - for len(conn.messageBuf) == 0 { - var m websocket.Message - m, err = conn.Ws.ReadMessage() - if err != nil { - return - } - if m.Opcode == 8 { - err = io.EOF - return - } - if m.Opcode != 2 { - err = fmt.Errorf("got non-binary opcode %d", m.Opcode) - return + var opCode int + if conn.r == nil { + // New message + var r io.Reader + for { + if opCode, r, err = conn.Ws.NextReader(); err != nil { + return + } + if opCode != websocket.BinaryMessage && opCode != websocket.TextMessage { + continue + } + + conn.r = r + break } - conn.messageBuf = m.Payload } - n = copy(b, conn.messageBuf) - conn.messageBuf = conn.messageBuf[n:] - + n, err = conn.r.Read(b) + if err != nil { + if err == io.EOF { + // Message finished + conn.r = nil + err = nil + } + } return } // Implements io.Writer. -func (conn *webSocketConn) Write(b []byte) (int, error) { - err := conn.Ws.WriteMessage(2, b) - return len(b), err +func (conn *webSocketConn) Write(b []byte) (n int, err error) { + var w io.WriteCloser + if w, err = conn.Ws.NextWriter(websocket.BinaryMessage); err != nil { + return + } + if n, err = w.Write(b); err != nil { + return + } + err = w.Close() + return } // Implements io.Closer. func (conn *webSocketConn) Close() error { - // Ignore any error in trying to write a Close frame. - _ = conn.Ws.WriteFrame(8, nil) - return conn.Ws.Conn.Close() + return conn.Ws.Close() } // Create a new webSocketConn. -func newWebSocketConn(ws *websocket.WebSocket) webSocketConn { +func newWebSocketConn(ws *websocket.Conn) webSocketConn { var conn webSocketConn conn.Ws = ws return conn @@ -145,16 +155,22 @@ func clientAddr(clientIPParam string) string { return (&net.TCPAddr{IP: clientIP, Port: 1, Zone: ""}).String() } -func webSocketHandler(ws *websocket.WebSocket) { - // Undo timeouts on HTTP request handling. - if err := ws.Conn.SetDeadline(time.Time{}); err != nil { - log.Printf("unable to set deadlines with error: %v", err) +var upgrader = websocket.Upgrader{} + +type HTTPHandler struct{} + +func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { + ws, err := upgrader.Upgrade(w, r, nil) + if err != nil { + log.Println(err) + return } + conn := newWebSocketConn(ws) defer conn.Close() // Pass the address of client as the remote address of incoming connection - clientIPParam := ws.Request().URL.Query().Get("client_ip") + clientIPParam := r.URL.Query().Get("client_ip") addr := clientAddr(clientIPParam) if addr == "" { statsChannel <- false @@ -162,7 +178,6 @@ func webSocketHandler(ws *websocket.WebSocket) { statsChannel <- true } or, err := pt.DialOr(&ptInfo, addr, ptMethodName) - if err != nil { log.Printf("failed to connect to ORPort: %s", err) return @@ -185,11 +200,12 @@ func initServer(addr *net.TCPAddr, return nil, fmt.Errorf("cannot listen on port %d; configure a port using ServerTransportListenAddr", addr.Port) } - var config websocket.Config - config.MaxMessageSize = maxMessageSize + upgrader.CheckOrigin = func(r *http.Request) bool { return true } + + var handler HTTPHandler server := &http.Server{ Addr: addr.String(), - Handler: config.Handler(webSocketHandler), + Handler: &handler, ReadTimeout: requestTimeout, } // We need to override server.TLSConfig.GetCertificate--but first

1 0

[snowflake/master] Restore sending close message before closing
by arlo＠torproject.org 11 Nov '19

11 Nov '19

commit abefae158716b9f56692ea16336c1f8185eda27e Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Nov 11 16:59:33 2019 -0500 Restore sending close message before closing And simplify EOF check. --- server/server.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/server.go b/server/server.go index d111fce..ce804fc 100644 --- a/server/server.go +++ b/server/server.go @@ -77,12 +77,10 @@ func (conn *webSocketConn) Read(b []byte) (n int, err error) { } n, err = conn.r.Read(b) - if err != nil { - if err == io.EOF { - // Message finished - conn.r = nil - err = nil - } + if err == io.EOF { + // Message finished + conn.r = nil + err = nil } return } @@ -102,6 +100,8 @@ func (conn *webSocketConn) Write(b []byte) (n int, err error) { // Implements io.Closer. func (conn *webSocketConn) Close() error { + // Ignore any error in trying to write a Close frame. + _ = conn.Ws.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(time.Second)) return conn.Ws.Close() }

1 0

[donate/master] Fixed utf-8 character that was messing up translations
by peterh＠torproject.org 11 Nov '19

11 Nov '19

commit c7d85d0ad590792a520a815bcba78a32b9d6b949 Author: peterh <peterh(a)giantrabbit.com> Date: Mon Nov 11 13:27:43 2019 -0800 Fixed utf-8 character that was messing up translations A utf-8 emdash was causinga warning with the translation stuff. --- .../dist/champions-of-privacy-white.a0dd8202.png | Bin 228759 -> 0 bytes public/dist/copy.958d2495.svg | 1 - .../dist/defenders-of-privacy-white.647dca98.png | Bin 214940 -> 0 bytes .../dist/end-of-2019-campaign-header.c377cdb9.png | Bin 263240 -> 0 bytes public/dist/facebook.ff210557.svg | 20 -- public/dist/github.4e95ff58.svg | 20 -- public/dist/instagram.97cb06de.svg | 20 -- public/dist/linkedin.59c8960f.svg | 20 -- public/dist/mastodon.98b5371a.svg | 20 -- public/dist/tor-header-campaign-2018.078dce4a.svg | 142 ---------- public/dist/tor-header-campaign-2018.ab4c974a.svg | 142 ---------- public/dist/twitter.74a014ed.svg | 20 -- templates/champions-of-privacy.twig | 2 +- translation/out/messages.pot | 313 +++++++++++---------- 14 files changed, 167 insertions(+), 553 deletions(-) diff --git a/public/dist/champions-of-privacy-white.a0dd8202.png b/public/dist/champions-of-privacy-white.a0dd8202.png deleted file mode 100644 index f0904d41..00000000 Binary files a/public/dist/champions-of-privacy-white.a0dd8202.png and /dev/null differ diff --git a/public/dist/copy.958d2495.svg b/public/dist/copy.958d2495.svg deleted file mode 100644 index 4e0b09f1..00000000 --- a/public/dist/copy.958d2495.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-copy"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg> \ No newline at end of file diff --git a/public/dist/defenders-of-privacy-white.647dca98.png b/public/dist/defenders-of-privacy-white.647dca98.png deleted file mode 100644 index 37c35ef3..00000000 Binary files a/public/dist/defenders-of-privacy-white.647dca98.png and /dev/null differ diff --git a/public/dist/end-of-2019-campaign-header.c377cdb9.png b/public/dist/end-of-2019-campaign-header.c377cdb9.png deleted file mode 100644 index 248ccc91..00000000 Binary files a/public/dist/end-of-2019-campaign-header.c377cdb9.png and /dev/null differ diff --git a/public/dist/facebook.ff210557.svg b/public/dist/facebook.ff210557.svg deleted file mode 100644 index 34fe86aa..00000000 --- a/public/dist/facebook.ff210557.svg +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>0BC8DFFF-C6F0-44B0-A296-76F4BD4E6560</title> - <desc>Created with sketchtool.</desc> - <defs></defs> - <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Footer" transform="translate(-1020.000000, -363.000000)" fill="#FFFFFF" fill-rule="nonzero"> - <g id="span2"> - <g transform="translate(1020.000000, 118.000000)"> - <g id="social-media" transform="translate(0.000000, 245.000000)"> - <g id="facebook-square"> - <path d="M20,2.14285714 L20,17.8571429 C20,19.0401786 19.0401786,20 17.8571429,20 L14.0491071,20 L14.0491071,12.0892857 L16.7544643,12.0892857 L17.1428571,9.07142857 L14.0491071,9.07142857 L14.0491071,7.14285714 C14.0491071,6.26785714 14.2901786,5.67410714 15.5446429,5.67410714 L17.1428571,5.67410714 L17.1428571,2.97767857 C16.8660714,2.94196429 15.9196429,2.85714286 14.8125,2.85714286 C12.5089286,2.85714286 10.9285714,4.26339286 10.9285714,6.84821429 L10.9285714,9.07589286 L8.21428571,9.07589286 L8.21428571,12.09375 L10.9330357,12.09375 L10.9330357,20 L2.14285714,20 C0.959821429,20 0,19.0401786 0,17.8571429 L0,2.14285714 C0,0.959821429 0.959821429,0 2.14285714,0 L17.8571429,0 C19.0401786,0 20,0.959821429 20,2.14285714 Z" id="Shape"></path> - </g> - </g> - </g> - </g> - </g> - </g> -</svg> \ No newline at end of file diff --git a/public/dist/github.4e95ff58.svg b/public/dist/github.4e95ff58.svg deleted file mode 100644 index 2c147de5..00000000 --- a/public/dist/github.4e95ff58.svg +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>B56BD0F9-AFB4-4A2A-8480-F1768DB4B584</title> - <desc>Created with sketchtool.</desc> - <defs></defs> - <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Footer" transform="translate(-1129.000000, -402.000000)" fill="#FFFFFF" fill-rule="nonzero"> - <g id="span2"> - <g transform="translate(1020.000000, 118.000000)"> - <g id="social-media" transform="translate(0.000000, 245.000000)"> - <g id="github" transform="translate(109.000000, 39.000000)"> - <path d="M6.68951613,16.0909091 C6.68951613,16.1735537 6.59677419,16.2396694 6.47983871,16.2396694 C6.34677419,16.2520661 6.25403226,16.1859504 6.25403226,16.0909091 C6.25403226,16.0082645 6.34677419,15.9421488 6.46370968,15.9421488 C6.58467742,15.9297521 6.68951613,15.9958678 6.68951613,16.0909091 Z M5.43548387,15.9049587 C5.40725806,15.9876033 5.48790323,16.0826446 5.60887097,16.107438 C5.71370968,16.1487603 5.83467742,16.107438 5.85887097,16.0247934 C5.88306452,15.9421488 5.80645161,15.8471074 5.68548387,15.8099174 C5.58064516,15.7809917 5.46370968,15.822314 5.43548387,15.9049587 Z M7.21774194,15.8347107 C7.10080645,15.8636364 7.02016129,15.9421488 7.03225806,16.0371901 C7.04435484,16.1198347 7.14919355,16.1735537 7.27016129,16.1446281 C7.38709677,16.1157025 7.46774194,16.0371901 7.45564516,15.9545455 C7.44354839,15.8760331 7.33467742,15.822314 7.21774194,15.8347107 Z M9.87096774,0 C4.27822581,0 0,4.35123967 0,10.0826446 C0,14.6652893 2.81451613,18.586 7769 6.83467742,19.9669421 C7.35080645,20.0619835 7.53225806,19.7355372 7.53225806,19.4669421 C7.53225806,19.2107438 7.52016129,17.7975207 7.52016129,16.9297521 C7.52016129,16.9297521 4.69758065,17.5495868 4.10483871,15.6983471 C4.10483871,15.6983471 3.64516129,14.4958678 2.98387097,14.1859504 C2.98387097,14.1859504 2.06048387,13.5371901 3.0483871,13.5495868 C3.0483871,13.5495868 4.05241935,13.6322314 4.60483871,14.6157025 C5.48790323,16.2107438 6.96774194,15.7520661 7.54435484,15.4793388 C7.63709677,14.8181818 7.89919355,14.3595041 8.18951613,14.0867769 C5.93548387,13.8305785 3.66129032,13.4958678 3.66129032,9.52066116 C3.66129032,8.38429752 3.96774194,7.81404959 4.61290323,7.08677686 C4.50806452,6.81818182 4.16532258,5.7107438 4.71774194,4.28099174 C5.56048387,4.01239669 7.5,5.39669421 7.5,5.39669421 C8.30645161,5.16528926 9.1733871,5.04545455 10.0322581,5.04545455 C10.891129,5.04545455 11.7580645,5.16528926 12.5645161,5.39669421 C12.5645161,5.39669421 14.5040323,4.00826446 15.346 7742,4.28099174 C15.8991935,5.71487603 15.5564516,6.81818182 15.4516129,7.08677686 C16.0967742,7.81818182 16.4919355,8.38842975 16.4919355,9.52066116 C16.4919355,13.5082645 14.1169355,13.8264463 11.8629032,14.0867769 C12.233871,14.4132231 12.5483871,15.0330579 12.5483871,16.0041322 C12.5483871,17.3966942 12.5362903,19.1198347 12.5362903,19.4586777 C12.5362903,19.7272727 12.7217742,20.053719 13.233871,19.9586777 C17.266129,18.5867769 20,14.6652893 20,10.0826446 C20,4.35123967 15.4637097,0 9.87096774,0 Z M3.91935484,14.2520661 C3.86693548,14.2933884 3.87903226,14.3884298 3.94758065,14.4669421 C4.01209677,14.5330579 4.10483871,14.5619835 4.15725806,14.5082645 C4.20967742,14.4669421 4.19758065,14.3719008 4.12903226,14.2933884 C4.06451613,14.2272727 3.97177419,14.1983471 3.91935484,14.2520661 Z M3.48387097,13.9173554 C3.45564516,13.9710744 3.49596774,14.0371901 3.5766129,14.0785124 C3.64112903,14.1198347 3.72177419,14.107438 3.75,14.0495868 C3.77822581,13.9958678 3.73790323,13.9297521 3. 65725806,13.8884298 C3.5766129,13.8636364 3.51209677,13.8760331 3.48387097,13.9173554 Z M4.79032258,15.3884298 C4.72580645,15.4421488 4.75,15.5661157 4.84274194,15.6446281 C4.93548387,15.7396694 5.05241935,15.7520661 5.10483871,15.6859504 C5.15725806,15.6322314 5.13306452,15.5082645 5.05241935,15.4297521 C4.96370968,15.3347107 4.84274194,15.322314 4.79032258,15.3884298 Z M4.33064516,14.7809917 C4.26612903,14.822314 4.26612903,14.9297521 4.33064516,15.0247934 C4.39516129,15.1198347 4.50403226,15.161157 4.55645161,15.1198347 C4.62096774,15.0661157 4.62096774,14.9586777 4.55645161,14.8636364 C4.5,14.768595 4.39516129,14.7272727 4.33064516,14.7809917 Z" id="Shape"></path> - </g> - </g> - </g> - </g> - </g> - </g> -</svg> \ No newline at end of file diff --git a/public/dist/instagram.97cb06de.svg b/public/dist/instagram.97cb06de.svg deleted file mode 100644 index 0215201a..00000000 --- a/public/dist/instagram.97cb06de.svg +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>E19A5313-E9FF-463A-BB3B-8EDD62B053A9</title> - <desc>Created with sketchtool.</desc> - <defs></defs> - <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Footer" transform="translate(-1020.000000, -402.000000)" fill="#FFFFFF" fill-rule="nonzero"> - <g id="span2"> - <g transform="translate(1020.000000, 118.000000)"> - <g id="social-media" transform="translate(0.000000, 245.000000)"> - <g id="instagram" transform="translate(0.000000, 39.000000)"> - <path d="M10.0044444,4.89977728 C7.17777778,4.89977728 4.89777778,7.18485523 4.89777778,10.0178174 C4.89777778,12.8507795 7.17777778,15.1358575 10.0044444,15.1358575 C12.8311111,15.1358575 15.1111111,12.8507795 15.1111111,10.0178174 C15.1111111,7.18485523 12.8311111,4.89977728 10.0044444,4.89977728 Z M10.0044444,13.3452116 C8.17777778,13.3452116 6.68444444,11.8530067 6.68444444,10.0178174 C6.68444444,8.18262806 8.17333333,6.69042316 10.0044444,6.69042316 C11.8355556,6.69042316 13.3244444,8.18262806 13.3244444,10.0178174 C13.3244444,11.8530067 11.8311111,13.3452116 10.0044444,13.3452116 Z M16.5111111,4.69042316 C16.5111111,5.35412027 15.9777778,5.88418708 15.32,5.88418708 C14.6577778,5.88418708 14.1288889,5.34966592 14.1288889,4.69042316 C14.1288889,4.0311804 14.6622222,3.49665924 15.32,3.49665924 C15.9777778,3.49665924 16.5111111,4.0311804 16.5111111,4.69042316 Z M19.8933333,5.90200445 C19.8177778,4.30289532 19.4533333,2.88641425 18.2844444,1.71937639 C17 .12,0.55233853 15.7066667,0.187082405 14.1111111,0.106904232 C12.4666667,0.013363029 7.53777778,0.013363029 5.89333333,0.106904232 C4.30222222,0.182628062 2.88888889,0.547884187 1.72,1.71492205 C0.551111111,2.88195991 0.191111111,4.29844098 0.111111111,5.89755011 C0.0177777778,7.54565702 0.0177777778,12.4855234 0.111111111,14.1336303 C0.186666667,15.7327394 0.551111111,17.1492205 1.72,18.3162584 C2.88888889,19.4832962 4.29777778,19.8485523 5.89333333,19.9287305 C7.53777778,20.0222717 12.4666667,20.0222717 14.1111111,19.9287305 C15.7066667,19.8530067 17.12,19.4877506 18.2844444,18.3162584 C19.4488889,17.1492205 19.8133333,15.7327394 19.8933333,14.1336303 C19.9866667,12.4855234 19.9866667,7.55011136 19.8933333,5.90200445 Z M17.7688889,15.9020045 C17.4222222,16.7750557 16.7511111,17.4476615 15.8755556,17.7995546 C14.5644444,18.3207127 11.4533333,18.2004454 10.0044444,18.2004454 C8.55555556,18.2004454 5.44,18.3162584 4.13333333,17.7995546 C3.26222222,17.4521158 2.59111111,16.77951 2.24, 15.9020045 C1.72,14.5879733 1.84,11.4699332 1.84,10.0178174 C1.84,8.56570156 1.72444444,5.44320713 2.24,4.13363029 C2.58666667,3.26057906 3.25777778,2.58797327 4.13333333,2.23608018 C5.44444444,1.71492205 8.55555556,1.83518931 10.0044444,1.83518931 C11.4533333,1.83518931 14.5688889,1.71937639 15.8755556,2.23608018 C16.7466667,2.58351893 17.4177778,3.25612472 17.7688889,4.13363029 C18.2888889,5.44766147 18.1688889,8.56570156 18.1688889,10.0178174 C18.1688889,11.4699332 18.2888889,14.5924276 17.7688889,15.9020045 Z" id="Shape"></path> - </g> - </g> - </g> - </g> - </g> - </g> -</svg> \ No newline at end of file diff --git a/public/dist/linkedin.59c8960f.svg b/public/dist/linkedin.59c8960f.svg deleted file mode 100644 index 9556aa39..00000000 --- a/public/dist/linkedin.59c8960f.svg +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>4892B42B-AD2A-485C-B3A8-F4045EFC4353</title> - <desc>Created with sketchtool.</desc> - <defs></defs> - <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Footer" transform="translate(-1075.000000, -402.000000)" fill="#FFFFFF" fill-rule="nonzero"> - <g id="span2"> - <g transform="translate(1020.000000, 118.000000)"> - <g id="social-media" transform="translate(0.000000, 245.000000)"> - <g id="linkedin-in" transform="translate(55.000000, 39.000000)"> - <path d="M4.46770601,20 L0.329621381,20 L0.329621381,6.64732143 L4.46770601,6.64732143 L4.46770601,20 Z M2.39643653,4.82589286 C1.07349666,4.82589286 0,3.72767857 0,2.40178571 C0,1.07589286 1.07349666,0 2.39643653,0 C3.71937639,0 4.79287305,1.07589286 4.79287305,2.40178571 C4.79287305,3.72767857 3.71937639,4.82589286 2.39643653,4.82589286 Z M19.9554566,20 L15.8262806,20 L15.8262806,13.5 C15.8262806,11.9508929 15.7951002,9.96428571 13.674833,9.96428571 C11.5233853,9.96428571 11.1937639,11.6473214 11.1937639,13.3883929 L11.1937639,20 L7.06013363,20 L7.06013363,6.64732143 L11.0289532,6.64732143 L11.0289532,8.46875 L11.0868597,8.46875 C11.6391982,7.41964286 12.9888641,6.3125 15.0022272,6.3125 C19.1893096,6.3125 19.9599109,9.07589286 19.9599109,12.6651786 L19.9599109,20 L19.9554566,20 Z" id="Shape"></path> - </g> - </g> - </g> - </g> - </g> - </g> -</svg> \ No newline at end of file diff --git a/public/dist/mastodon.98b5371a.svg b/public/dist/mastodon.98b5371a.svg deleted file mode 100644 index 406a7740..00000000 --- a/public/dist/mastodon.98b5371a.svg +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>1FA6A4EC-B363-4D6D-BA70-6D2B78E22640</title> - <desc>Created with sketchtool.</desc> - <defs></defs> - <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Footer" transform="translate(-1075.000000, -363.000000)" fill="#FFFFFF" fill-rule="nonzero"> - <g id="span2"> - <g transform="translate(1020.000000, 118.000000)"> - <g id="social-media" transform="translate(0.000000, 245.000000)"> - <g id="mastodont" transform="translate(55.000000, 0.000000)"> - <path d="M19.7668874,3.46900752 C19.504455,3.41358252 19.2252026,3.38566815 18.9290237,3.38566815 C17.7627558,3.38566815 16.8798845,3.79439929 16.2961281,4.61214552 L15.7285568,5.48014907 L15.16083,4.61214552 C14.5772291,3.79439929 13.6942022,3.38566815 12.52809,3.38566815 C11.5204059,3.38566815 10.7085004,3.70879148 10.0884829,4.33913753 C9.48729625,4.96962555 9.18802576,5.82172848 9.18802576,6.89402662 L9.18802576,12.1406637 L11.466559,12.1406637 L11.466559,7.04820586 C11.466559,5.97462999 11.9617637,5.42989175 12.9521732,5.42989175 C14.0470083,5.42989175 14.5959044,6.07628039 14.5959044,7.35429281 L14.5959044,10.1415865 L16.8610537,10.1415865 L16.8610537,7.35429281 C16.8610537,6.07628039 17.4099497,5.42989175 18.5047848,5.42989175 C19.4951943,5.42989175 19.9903991,5.97462999 19.9903991,7.04820586 L19.9903991,11.9693312 C19.9900362,11.9710337 19.9896731,11.9727398 19.9893097,11.9744454 C19.6889498,13.383496 17.3003884,14.9254303 14.556842,15.2242768 C13 .1261641,15.3801597 11.7177408,15.5231233 10.2157857,15.4603727 C7.75937096,15.3577285 5.82119374,14.9254303 5.82119374,14.9254303 C5.82119374,15.143638 5.83597829,15.3513398 5.86539177,15.5455546 C6.18473814,17.7568767 8.26920463,17.8894765 10.2436429,17.9512334 C12.2364452,18.0134161 14.0107473,17.5028926 14.0107473,17.5028926 L14.0927626,19.1466193 C14.0927626,19.1466193 12.6988126,19.8293523 10.2157857,19.9548536 C8.84642474,20.023567 7.14635666,19.9234783 5.16600455,19.4454658 C0.871325046,18.4083762 0.132719852,14.2321917 0.0197347337,9.99467613 C-0.0148144347,8.73653949 0.00650644847,7.5500976 0.00650644847,6.55801242 C0.00650644847,2.22480923 3.11857726,0.954747116 3.11857726,0.954747116 C4.68776314,0.297284827 7.38041949,0.0208695652 10.1796803,0 L10.2484673,0 C13.0477281,0.0208695652 15.7420964,0.297284827 17.3112822,0.954747116 C17.3112822,0.954747116 18.853806,1.58426396 19.7668874,3.46900752 Z M4.31491225,5.507748 C4.31491225,6.13837799 4.87548028,6.64975333 5.5667749,6 .64975333 C6.25822515,6.64975333 6.81863756,6.13837799 6.81863756,5.507748 C6.81863756,4.87697604 6.25822515,4.36574268 5.5667749,4.36574268 C4.87548028,4.36574268 4.31491225,4.87697604 4.31491225,5.507748 Z" id="Shape"></path> - </g> - </g> - </g> - </g> - </g> - </g> -</svg> \ No newline at end of file diff --git a/public/dist/tor-header-campaign-2018.078dce4a.svg b/public/dist/tor-header-campaign-2018.078dce4a.svg deleted file mode 100644 index dae28991..00000000 --- a/public/dist/tor-header-campaign-2018.078dce4a.svg +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="613px" height="350px" viewBox="0 0 613 350" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>59DCF220-ACE3-43CF-A8E0-C1DFFCA18BED(a)1.5x</title> - <desc>Created with sketchtool.</desc> - <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="donate.tpo.org---Iteration" transform="translate(-816.000000, -70.000000)"> - <g id="Hero"> - <g id="artwork" transform="translate(1123.000000, 275.000000) scale(-1, 1) translate(-1123.000000, -275.000000) translate(813.000000, 66.000000)"> - <g id="Group-23-Copy-5" transform="translate(505.000000, 74.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.348148, 128.441748) scale(-1, 1) rotate(-2.000000) translate(-56.348148, -128.441748) translate(4.348148, 25.941748)"> - <path d="M35.8212974,64.1902606 C39.7225678,51.6891259 40.2295616,44.4368403 37.3422789,42.4334038 C15.4532326,27.2449658 49.3679512,3.13027094 63.2911811,4.72727574 C89.2008905,7.69913866 80.904321,33.2769419 73.1218555,43.4173847 C65.33939,53.5578274 61.6375239,48.0377384 58.7379542,57.151995 C56.8049077,63.2281661 55.4415513,65.7352657 54.6478849,64.6732936 L35.8212974,64.1902606 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.509676, 34.781047) rotate(-11.000000) translate(-55.509676, -34.781047) "></path> - <path d="M24.8323685,201.727383 L24.3265111,201.727383 L12.4815212,119.478881 L8.71080938,173.418986 L2.71231027,169.636516 L0.436463994,57.2286238 L28.8591508,58.9278306 L103.403722,60.2930117 L101.127875,172.700904 L95.1293761,176.483374 L91.3586643,122.543269 L79.5136744,204.791771 L24.8323685,204.791771 L24.8323685,201.727383 Z" id="Combined-Shape" fill="#2E2798"></path> - </g> - <path d="M85.7624649,49.3501369 L21.1988594,70.9396812 C15.8436936,52.9412106 18.7162435,41.568607 29.8165092,36.8218706 C46.4669077,29.701766 24.1497249,20.0024263 46.4603827,11.6775464 C61.3341546,6.12762642 74.4348487,18.6851566 85.7624649,49.3501369 Z" id="Path-19" fill="#2E2798" transform="translate(52.173595, 40.670721) scale(-1, 1) rotate(20.000000) translate(-52.173595, -40.670721) "></path> - </g> - <g id="Group-23-Copy-11" transform="translate(0.000000, 166.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.362187, 127.638132) scale(-1, 1) rotate(-2.000000) translate(-56.362187, -127.638132) translate(4.362187, 25.138132)"> - <path d="M35.8920178,64.189094 C39.7981834,51.6880298 40.3048819,44.4354948 37.4121133,42.431489 C15.4814768,27.2387353 49.4527482,3.12853815 63.401098,4.72791764 C89.357553,7.70419961 81.0504063,33.2818067 73.2557261,43.421429 C65.4610459,53.5610513 61.7516575,48.0400968 58.8484201,57.1542929 C56.9129286,63.2304236 55.5475533,65.737413 54.7522942,64.675261 L35.8920178,64.189094 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.609284, 34.782273) rotate(-11.000000) translate(-55.609284, -34.782273) "></path> - <path d="M24.8774978,201.730168 L24.370721,201.730168 L12.5042045,119.480531 L8.72664002,173.42138 L2.7172395,169.638858 L0.437257204,57.2294139 L28.9115982,58.9286441 L103.591643,60.2938441 L101.311661,172.703288 L95.3022601,176.48581 L91.5246955,122.544961 L79.6581791,204.794599 L24.8774978,204.794599 L24.8774978,201.730168 Z" id="Combined-Shape" fill="#42D3BC"></path> - </g> - <path d="M85.3544074,48.6576394 L20.6740076,70.2680221 C15.3147749,52.2689634 18.1954784,40.8942139 29.3161182,36.1437737 C45.9970779,29.0181133 23.6443981,19.3239676 45.995661,10.9917856 C60.8965029,5.43699753 74.0160851,17.9922821 85.3544074,48.6576394 Z" id="Path-19" fill="#2E2798" transform="translate(51.707096, 39.990984) scale(-1, 1) rotate(20.000000) translate(-51.707096, -39.990984) "></path> - </g> - <g id="Group-23-Copy-7" transform="translate(449.000000, 107.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.963640, 79.812539) scale(-1, 1) rotate(-2.000000) translate(-54.963640, -79.812539) translate(2.963640, 1.812539)"> - <path d="M35.8989775,76.6397301 C39.8008103,64.1422795 40.3052562,56.8913132 37.4123152,54.8868313 C15.4803721,39.6904679 49.4393634,15.5951695 63.3861234,17.1984201 C89.3396199,20.1819056 81.0413851,45.7520246 73.2509058,55.8873283 C65.4604266,66.022632 61.7499311,60.5016435 58.849861,69.6131884 C56.9164808,75.6875517 55.5520608,78.1936418 54.7566009,77.1314588 L35.8989775,76.6397301 Z" id="Path-11-Copy-3" fill="#420C5D" transform="translate(55.601964, 47.245458) rotate(-11.000000) translate(-55.601964, -47.245458) "></path> - <path d="M24.8752559,153.640615 L24.3685248,153.640615 L12.5030777,105.853502 L8.72585359,137.193183 L2.71699463,134.995535 L0.4372178,69.6855475 L28.9089927,70.6728018 L103.582307,71.4659842 L101.302531,136.775971 L95.2936716,138.97362 L91.5164476,107.633939 L79.6510005,155.421051 L24.8752559,155.421051 L24.8752559,153.640615 Z" id="Combined-Shape" fill="#42D3BC"></path> - <path d="M23.8661526,44.6857613 L55.4680487,50.2677843 L73.5570663,33.66018 L70.1765274,52.8658267 L83.4703281,53.6517687 C92.4359909,30.0692483 83.9509572,14.631553 58.015227,7.33868285 C32.0794967,0.0458126581 20.696472,12.4948388 23.8661526,44.6857613 Z" id="Path-17" fill="#7D4698" transform="translate(55.136710, 29.484951) scale(-1, 1) rotate(-10.000000) translate(-55.136710, -29.484951) "></path> - </g> - </g> - <g id="Group-23-Copy-8" transform="translate(189.000000, 103.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.188944, 89.816249) scale(-1, 1) rotate(-2.000000) translate(-56.188944, -89.816249) translate(3.688944, 1.816249)"> - <path d="M36.1017614,96.5132318 C40.0215729,83.9798072 40.5269927,76.7075457 37.6180207,74.6964473 C15.5645438,59.4499233 49.7003022,35.2916262 63.7224152,36.9029674 C89.8161359,39.9015089 81.4794231,65.545156 73.6494962,75.7085213 C65.8195694,85.8718867 62.0878056,80.3336986 59.1743301,89.4714579 C57.2320131,95.5632974 55.8608595,98.0764613 55.0608692,97.0109496 L36.1017614,96.5132318 Z" id="Path-11-Copy-3" fill="#420C5D" transform="translate(55.901600, 67.037595) rotate(-11.000000) translate(-55.901600, -67.037595) "></path> - <path d="M25.0101309,173.740953 L24.5006523,173.740953 L12.5708701,125.814924 L8.77316565,157.24571 L2.73172633,155.041673 L0.439588419,89.5418308 L29.0657389,90.531955 L104.143936,91.3274432 L101.851799,156.827285 L95.8103592,159.031322 L92.0126548,127.600537 L80.0828726,175.526566 L25.0101309,175.526566 L25.0101309,173.740953 Z" id="Combined-Shape" fill="#7D4698"></path> - <path d="M91.8935109,48.9382881 L26.870061,70.6733826 C21.50079,52.6254727 24.4064459,41.2140291 35.5870286,36.4390517 C52.3579025,29.2765858 29.9026143,19.5742115 52.3732262,11.1963484 C67.3536342,5.61110627 80.5270624,18.1917529 91.8935109,48.9382881 Z" id="Path-19" fill="#2E2798" transform="translate(58.075321, 40.290906) rotate(20.000000) translate(-58.075321, -40.290906) "></path> - </g> - </g> - <g id="Group-24" transform="translate(293.000000, 90.000000)"> - <g id="Group-22"> - <g id="Group-2-Copy-4" transform="translate(56.255141, 90.803656) scale(-1, 1) rotate(-2.000000) translate(-56.255141, -90.803656) translate(3.755141, 1.803656)"> - <path d="M36.1152327,99.3255347 C40.0297886,86.8873928 40.5322964,79.6697051 37.6227561,77.6724716 C15.5649707,62.5310592 49.6885329,38.5671203 63.7101925,40.172059 C89.8030696,43.1586859 81.4771344,68.607255 73.6518308,78.6914831 C65.8265273,88.7757112 62.0928659,83.2774266 59.1832264,92.3456955 C57.2434668,98.3912081 55.8734124,100.885031 55.0730634,99.8271632 L36.1152327,99.3255347 Z" id="Path-11-Copy-3" fill="#2E2798" transform="translate(55.898559, 70.079441) rotate(-11.000000) translate(-55.898559, -70.079441) "></path> - <path d="M25.0101309,175.974975 L24.5006523,175.974975 L12.5708701,128.410965 L8.77316565,159.604331 L2.73172633,157.416943 L0.439588419,92.4118676 L29.0657389,93.3945128 L104.143936,94.1839921 L101.851799,159.189068 L95.8103592,161.376456 L92.0126548,130.18309 L80.0828726,177.747099 L25.0101309,177.747099 L25.0101309,175.974975 Z" id="Combined-Shape" fill="#5058AD"></path> - <path d="M32.4583644,38.6997267 C25.931787,36.8250835 21.1608099,30.8605783 21.1608099,23.7925008 C21.1608099,15.2212583 28.1768537,8.27289343 36.8315822,8.27289343 C45.4863108,8.27289343 52.5023546,15.2212583 52.5023546,23.7925008 C52.5023546,24.8976479 52.3857153,25.9758152 52.1639632,27.0155874 C54.3720099,25.9893813 56.3948165,25.1878247 58.2323831,24.6109176 C68.0240652,21.5368026 95.5674242,30.1857505 57.1454655,54.8317155 C31.5308263,71.2623588 23.0276871,66.0731585 31.6360478,39.2641145 C31.9115672,39.0742706 32.1856728,38.8861413 32.4583644,38.6997267 Z" id="Combined-Shape-Copy-2" fill="#42D3BC" transform="translate(49.063994, 36.234913) rotate(20.000000) translate(-49.063994, -36.234913) "></path> - </g> - </g> - </g> - <g id="Group-23-Copy-3" transform="translate(507.000000, 190.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.601972, 114.169847) scale(-1, 1) rotate(-2.000000) translate(-56.601972, -114.169847) translate(4.101972, 20.169847)"> - <path d="M36.1863761,64.3114811 C40.1056092,51.78552 40.6077034,44.5165744 37.6926587,42.5046442 C15.5931432,27.251814 49.7727136,3.12314988 63.8194533,4.74186389 C89.9590019,7.7541254 81.6229372,33.3823202 73.7856175,43.5369653 C65.9482978,53.6916104 62.2070433,48.1535861 59.2938954,57.285872 C57.3517968,63.3740626 55.9797701,65.8853942 55.1778152,64.819867 L36.1863761,64.3114811 Z" id="Path-11-Copy-3" fill="#7D4698" transform="translate(55.997894, 34.861178) rotate(-11.000000) translate(-55.997894, -34.861178) "></path> - <path d="M25.0551942,184.947192 L24.5447976,184.947192 L12.5935203,112.319571 L7.88289407,185.781914 L1.83056927,182.441893 L0.44038047,57.3509332 L29.1181096,58.8513782 L104.331583,60.0568695 L102.035315,159.316036 L95.9829905,162.656058 L92.1784434,115.025507 L80.2271661,187.653128 L25.0551942,187.653128 L25.0551942,184.947192 Z" id="Combined-Shape" fill="#A9FEF8"></path> - </g> - <path d="M55.7165892,2.63158118 C59.6235395,0.877193727 64.2520263,0 69.6020496,0 C88.4129503,0 97.8184006,18.7443485 97.8184006,56.2330455 L68.8739128,56.2330455 L69.6020496,32.5330377 L41.8311288,32.5330377 L42.5592655,56.2330455 L13.6147777,56.2330455 C13.6147777,18.7443485 23.0202281,0 41.8311288,0 C47.181152,0 51.8096388,0.877193727 55.7165892,2.63158118 Z" id="Combined-Shape" fill="#420C5D"></path> - </g> - <g id="Group-23-Copy-12" transform="translate(82.000000, 161.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.601972, 114.169847) scale(-1, 1) rotate(-2.000000) translate(-56.601972, -114.169847) translate(4.101972, 20.169847)"> - <path d="M36.1863761,64.3114811 C40.1056092,51.78552 40.6077034,44.5165744 37.6926587,42.5046442 C15.5931432,27.251814 49.7727136,3.12314988 63.8194533,4.74186389 C89.9590019,7.7541254 81.6229372,33.3823202 73.7856175,43.5369653 C65.9482978,53.6916104 62.2070433,48.1535861 59.2938954,57.285872 C57.3517968,63.3740626 55.9797701,65.8853942 55.1778152,64.819867 L36.1863761,64.3114811 Z" id="Path-11-Copy-3" fill="#7D4698" transform="translate(55.997894, 34.861178) rotate(-11.000000) translate(-55.997894, -34.861178) "></path> - <path d="M25.0551942,184.947192 L24.5447976,184.947192 L12.5935203,112.319571 L7.88289407,185.781914 L1.83056927,182.441893 L0.44038047,57.3509332 L29.1181096,58.8513782 L104.331583,60.0568695 L102.035315,159.316036 L95.9829905,162.656058 L92.1784434,115.025507 L80.2271661,187.653128 L25.0551942,187.653128 L25.0551942,184.947192 Z" id="Combined-Shape" fill="#A9FEF8"></path> - </g> - <path d="M55.7165892,2.63158118 C59.6235395,0.877193727 64.2520263,0 69.6020496,0 C88.4129503,0 97.8184006,18.7443485 97.8184006,56.2330455 L68.8739128,56.2330455 L69.6020496,32.5330377 L41.8311288,32.5330377 L42.5592655,56.2330455 L13.6147777,56.2330455 C13.6147777,18.7443485 23.0202281,0 41.8311288,0 C47.181152,0 51.8096388,0.877193727 55.7165892,2.63158118 Z" id="Combined-Shape" fill="#420C5D"></path> - </g> - <g id="Group-23-Copy" transform="translate(371.000000, 78.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.614088, 137.885799) scale(-1, 1) rotate(-2.000000) translate(-54.614088, -137.885799) translate(2.614088, 66.385799)"> - <path d="M35.8356178,64.1531094 C39.7386129,51.6592193 40.2458855,44.4111544 37.3574358,42.4089147 C15.4595418,27.2295494 49.3884319,3.12856117 63.3173679,4.72449387 C89.2376959,7.6943617 80.9374684,33.2573453 73.1517063,43.3919585 C65.3659441,53.5265716 61.6626103,48.0097367 58.7617605,57.118712 C56.8278606,63.1913622 55.4639196,65.6970147 54.6699373,64.6356696 L35.8356178,64.1531094 Z" id="Path-11-Copy-3" fill="#A9FEF8" transform="translate(55.532455, 34.760802) rotate(-11.000000) translate(-55.532455, -34.760802) "></path> - <path d="M24.8425253,141.121832 L24.3364609,141.121832 L12.4866263,93.3510113 L8.71437221,124.680008 L2.71341964,122.483109 L0.436642513,57.1953876 L28.8709546,58.1823054 L103.446015,58.9752173 L101.169238,124.262939 L95.1682852,126.459838 L91.3960312,95.130841 L79.5461965,142.901662 L24.8425253,142.901662 L24.8425253,141.121832 Z" id="Combined-Shape" fill="#7D4698"></path> - </g> - <path d="M24.6833561,29.2724984 C37.9883586,15.3144778 50.1848218,11.8216104 61.2727458,18.7938961 C77.9046317,29.2523246 76.9462099,51.505195 96.5827071,48.5975257 C116.219204,45.6898564 118.573394,90.5452943 96.5655186,93.9023511 C74.5576433,97.2594078 63.3485919,87.5239802 44.0086673,77.6570881 C31.1153841,71.07916 24.6736138,54.9509634 24.6833561,29.2724984 Z" id="Path-3" fill="#2E2798" transform="translate(68.443187, 54.944117) rotate(-70.000000) translate(-68.443187, -54.944117) "></path> - </g> - <g id="Group-23-Copy-2" transform="translate(433.000000, 200.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.795826, 87.114546) scale(-1, 1) rotate(-2.000000) translate(-54.795826, -87.114546) translate(2.795826, 14.114546)"> - <path d="M35.0923015,66.7066247 C38.9814313,54.1464449 39.4791186,46.8575055 36.5853633,44.8398066 C14.6472472,29.543242 48.5725572,5.3507103 62.5159246,6.97496537 C88.463108,9.99753825 81.8038159,40.6661634 74.0252468,50.8481909 C66.2466777,61.0302183 60.9196169,50.5062012 58.0288273,59.6634306 C56.1016343,65.7682502 54.7399639,68.2863973 53.9438162,67.217872 L35.0923015,66.7066247 Z" id="Path-11-Copy-3" fill="#7D4698" transform="translate(55.187099, 37.176913) scale(-1, 1) rotate(-19.000000) translate(-55.187099, -37.176913) "></path> - <path d="M24.8752559,144.17724 L24.3685248,144.17724 L12.5030777,96.1536243 L8.72585359,127.648409 L2.71699463,125.439884 L0.4372178,59.8066714 L28.9089927,60.7988117 L103.582307,61.5959197 L101.302531,127.229132 L95.2936716,129.437657 L91.5164476,97.9428726 L79.6510005,145.966488 L24.8752559,145.966488 L24.8752559,144.17724 Z" id="Combined-Shape" fill="#42D3BC"></path> - </g> - <path d="M20.1156416,35.6470241 L74.1904238,43.0920556 C89.8593993,25.3866075 85.9284876,13.5104044 62.3976887,7.46344617 C38.8668898,1.41648797 24.7728741,10.8110139 20.1156416,35.6470241 Z" id="Path-17" fill="#5058AD" transform="translate(51.850447, 24.389744) rotate(-10.000000) translate(-51.850447, -24.389744) "></path> - </g> - <g id="Group-23-Copy-10" transform="translate(363.000000, 168.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.750448, 96.891493) scale(-1, 1) rotate(-2.000000) translate(-54.750448, -96.891493) translate(2.750448, 25.391493)"> - <path d="M35.9043237,64.0405307 C39.8040692,51.5679656 40.307358,44.3311594 37.4141902,42.3301123 C15.4805279,27.1597886 49.4346835,3.11665172 63.3812678,4.71899518 C89.3344375,7.7007928 81.0404829,33.2199457 73.2518384,43.3343357 C65.463194,53.4487258 61.7519432,47.9378713 58.8533965,57.0312641 C56.921032,63.093526 55.5570485,65.5945339 54.7614458,64.5342876 L35.9043237,64.0405307 Z" id="Path-11-Copy-3" fill="#50E3C2" transform="translate(55.600755, 34.706925) rotate(-11.000000) translate(-55.600755, -34.706925) "></path> - <path d="M24.8752559,140.891501 L24.3685248,140.891501 L12.5030777,93.1986491 L8.72585359,124.476513 L2.71699463,122.283199 L0.4372178,57.1020366 L28.9089927,58.0873435 L103.582307,58.8789614 L101.302531,124.060124 L95.2936716,126.253437 L91.5164476,94.9755739 L79.6510005,142.668426 L24.8752559,142.668426 L24.8752559,140.891501 Z" id="Combined-Shape" fill="#A9FEF8"></path> - </g> - <path d="M92.8295381,49.2031697 L28.1564785,70.8224066 C22.8133935,52.8624718 25.7019461,41.507527 36.8221366,36.7575721 C53.5024222,29.6326398 31.1657556,19.9748477 53.5151607,11.6412828 C68.4147641,6.08557287 81.5195565,18.6062018 92.8295381,49.2031697 Z" id="Path-19" fill="#2E2798" transform="translate(59.192452, 40.591520) rotate(20.000000) translate(-59.192452, -40.591520) "></path> - </g> - <g id="Group-21" transform="translate(223.000000, 65.000000)"> - <g id="Group-2-Copy-3" transform="translate(103.786494, 140.916899) scale(-1, 1) rotate(-2.000000) translate(-103.786494, -140.916899) translate(36.786494, 2.416899)"> - <path d="M70.0527866,194.897685 C73.9316108,182.383455 74.4360383,175.123677 71.5660691,173.118349 C49.8082795,157.915575 83.522599,133.774061 97.3628413,135.371887 C123.118119,138.345277 114.869347,163.949891 107.132581,174.101229 C99.395814,184.252566 95.7163299,178.727015 92.833454,187.850822 C90.9115368,193.93336 89.5561405,196.44312 88.7672652,195.380102 L70.0527866,194.897685 Z" id="Path-11-Copy-3" fill="#42D3BC" transform="translate(89.626313, 165.456869) rotate(-11.000000) translate(-89.626313, -165.456869) "></path> - <path d="M54.9312326,275.050779 L54.4283926,275.050779 L41.8553201,244.656105 L0.356586957,0.605746658 L12.9107244,5.08520228 L59.1293467,191.97877 L133.033909,192.770874 L130.771638,258.16453 L124.80892,260.364994 L121.0607,228.985164 L109.286366,276.833497 L54.9312326,276.833497 L54.9312326,275.050779 Z" id="Combined-Shape" fill="#7D4698"></path> - </g> - <path d="M25.9647891,129.020196 C4.96517701,107.261018 4.97427469,94.535694 25.9920822,90.8442255 C57.5187935,85.3070228 53.1574039,114.094694 69.8023514,96.3275814 C86.447299,78.5604685 147.652611,90.0428473 125.852902,110.249179 C104.053193,130.455511 137.760649,143.323449 104.031085,161.378047 C81.5447095,173.414446 66.7435151,168.40738 59.6275024,146.356848 L25.9647891,129.020196 Z" id="Path-2-Copy" fill="#A9FEF8" transform="translate(70.356497, 127.646645) rotate(-50.000000) translate(-70.356497, -127.646645) "></path> - </g> - <g id="onion" transform="translate(385.694465, 46.224865) scale(-1, 1) rotate(-6.000000) translate(-385.694465, -46.224865) translate(356.194465, 3.224865)" fill="#42D3BC" fill-rule="nonzero"> - <path d="M35.4175775,48.857701 C34.2855876,45.3773252 32.5420623,42.2472913 30.7316016,39.3797293 C30.3856161,41.2956534 29.9457877,43.1689157 29.3395502,44.1946451 C28.5551677,45.5029077 28.3567497,46.1258105 27.4706572,46.8025885 C24.8743109,50.4618144 24.016802,51.0005669 22.392299,57.6539216 C22.0476281,59.0637367 21.4795285,61.2678542 21.7751308,62.6767158 C22.6612234,66.7364303 23.3500888,69.5279309 24.9098022,72.4576955 C24.9098022,72.4576955 25.2125505,72.7478114 25.2125505,72.860568 C26.4706877,74.5634755 26.6750146,75.1299714 28.9579242,76.6227828 C30.7553931,75.2554973 32.3144709,73.599103 33.5880807,70.9605761 C32.1518381,68.8414353 30.8160746,66.0571531 30.368906,63.1215313 C30.0891864,61.7485207 30.2202506,60.5271855 30.5396568,59.1071632 C31.8206973,53.8428073 33.1185909,51.4646939 35.4175775,48.857701 Z M36.3012503,52.3238774 C35.3430894,53.7610192 34.7348292,55.1393056 33.8394783,58.8063274 C33.5597587,59.9504707 33.0987143,61.7392345 33.3386 12,62.8826039 C33.788186,64.9423687 34.1752006,66.5998626 34.7114586,68.133995 C35.55978,65.5369278 36.225463,62.2091771 36.6861887,57.8221841 C36.7693718,55.8996821 36.6222043,54.0699554 36.3012503,52.3238774 Z M30.6392972,35.0787913 C30.8438052,34.169899 31.1098759,33.2215141 31.3393116,32.279478 C28.4379882,31.2930249 26.7945265,30.4341684 26.4089266,29.7029086 C26.1472937,29.2067423 27.2326782,28.2098305 29.6650803,26.7121733 L29.6904341,26.7203549 L29.6552599,26.7054292 L29.6650803,26.7121733 L31.835078,28.8160171 C31.8408319,29.0402441 31.8354142,29.2689415 31.8206147,29.5012738 C30.401046,29.5755384 26.610579,29.1199012 26.8034247,29.7444049 C27.3526776,32.0048974 26.4175714,33.2965583 25.9289739,34.2729795 C23.4263633,38.7934478 21.1281739,40.1495883 18.0153972,42.7146312 C12.5202879,47.2350996 6.99420583,50.0403731 7.6652854,62.4419551 C7.9706266,68.5510452 11.3639662,76.1196008 18.5058015,79.601653 C19.7234561,80.192618 20.87911,80.7069053 22.0287626,81.1436591 C24.0380869 ,79.7331391 25.9029709,78.7070249 27.5910054,77.5882169 C25.8490268,76.7608875 24.4599663,75.7262909 23.2902061,74.179558 C23.2902061,74.1232989 22.9298142,73.8081525 22.9298142,73.8081525 C20.862265,71.1024708 18.7542223,67.1619494 18.1158546,62.9711225 C17.7711837,61.2792967 17.9326812,59.7743656 18.3262539,58.0246119 C19.9998254,51.1471743 21.6967402,48.2674708 24.8623772,44.810873 C25.6994012,44.1908309 26.4592493,43.2039126 27.2467283,42.2076973 C28.097963,41.02179 29.5807976,37.9168836 30.6392972,35.0787913 Z M32.3482049,27.5780124 L37.232793,29.1542594 C35.6454317,34.4083352 38.1513977,36.3637607 39.6775874,37.2213581 C43.0949311,39.1153052 46.3935453,41.070214 49.0184988,43.451855 C53.963839,47.9723234 56.7720489,54.3268103 56.7720489,61.048101 C56.7720489,67.7073966 53.7186368,74.1212954 48.5926214,78.3989501 C43.7711728,82.4312078 37.1171608,84.1412364 30.6464051,84.1412364 C26.6173467,84.1412364 23.0167467,83.9583512 19.1089987,82.6747965 C10.1965459,79.6809549 3.54253389 ,72.0452381 2.99276486,62.8803114 C2.50416732,55.7328051 4.0915286,50.2953275 9.64677687,44.612453 C12.5143515,41.6186114 16.2620727,37.511443 20.2291854,34.7629983 C22.1830594,33.4187401 23.1174086,31.6864967 19.1495216,24.5389904 L22.453298,21.7595482 L26.9646021,24.8576447 C25.7124432,13.910884 22.8910363,13.1839857 37.6919663,1.3965173 L37.6922244,1.39755055 C33.5418554,6.22282762 37.4592307,9.07459736 35.1392828,13.8998744 C39.0470308,8.4004018 48.1324157,6.50697134 54.0534023,4.4895509 C46.247612,11.4540244 40.0775396,20.6671751 32.3482043,27.5780122 Z" id="Combined-Shape" transform="translate(29.840713, 42.768877) rotate(-3.000000) translate(-29.840713, -42.768877) "></path> - </g> - <g id="Group-23-Copy-6" transform="translate(290.000000, 239.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.741380, 92.167466) scale(-1, 1) rotate(-2.000000) translate(-54.741380, -92.167466) translate(2.741380, 20.167466)"> - <path d="M35.8825554,64.2637833 C39.7908008,51.748347 40.2988018,44.4877966 37.4065582,42.482132 C15.4799028,27.2768025 49.453745,3.13403993 63.4010416,4.73260944 C89.3555367,7.70738412 81.0441518,33.3144546 73.2480367,43.4665822 C65.4519217,53.6187099 61.7437478,48.0924044 58.8389972,57.2170889 C56.9024967,63.300212 55.5367361,65.8101902 54.7417152,64.7470237 L35.8825554,64.2637833 Z" id="Path-11-Copy-3" fill="#2E2798" transform="translate(55.605683, 34.820680) rotate(-11.000000) translate(-55.605683, -34.820680) "></path> - <path d="M24.8752559,141.365071 L24.3685248,141.365071 L12.5030777,93.5119121 L8.72585359,124.894908 L2.71699463,122.694222 L0.4372178,57.2939702 L28.9089927,58.282589 L103.582307,59.0768677 L101.302531,124.47712 L95.2936716,126.677806 L91.5164476,95.2948096 L79.6510005,143.147969 L24.8752559,143.147969 L24.8752559,141.365071 Z" id="Combined-Shape" fill="#50E3C2"></path> - </g> - <path d="M52.9763434,2.6289674 C56.8552353,0.876322467 61.4504818,0 66.7620829,0 C85.4378898,0 94.7757932,18.725731 94.7757932,56.1771929 L66.0391754,56.1771929 L66.7620829,32.5007247 L39.1906039,32.5007247 L39.9135114,56.1771929 L11.1768936,56.1771929 C11.1768936,18.725731 20.514797,0 39.1906039,0 C44.502205,0 49.0974515,0.876322467 52.9763434,2.6289674 Z" id="Combined-Shape" fill="#420C5D"></path> - </g> - <g id="Group-23-Copy-4" transform="translate(132.000000, 193.000000)"> - <g id="Group-2-Copy-2" transform="translate(55.342352, 106.297683) scale(-1, 1) rotate(-2.000000) translate(-55.342352, -106.297683) translate(3.842352, 1.797683)"> - <path d="M35.610391,82.5466625 C39.470061,70.0772996 39.9654618,62.8415274 37.0965935,60.839346 C15.3471506,45.6604226 48.9931879,21.6358407 62.8187534,23.2445395 C88.5467194,26.2381638 80.337511,51.7506172 72.6217647,61.8602437 C64.9060184,71.9698702 61.2245173,66.4578853 58.3556719,75.5489176 C56.4431083,81.6096058 55.0922432,84.1096989 54.3030766,83.0491969 L35.610391,82.5466625 Z" id="Path-11-Copy-3" fill="#42D3BC" transform="translate(55.116611, 53.226907) rotate(-11.000000) translate(-55.116611, -53.226907) "></path> - <path d="M24.6603127,205.656291 L24.1579602,205.656291 L12.3950406,131.637153 L8.65045487,180.180286 L2.69351751,176.776271 L0.43343987,75.6153375 L28.6591947,77.1445304 L102.687269,78.3731185 L99.8921122,194.962727 L93.9351748,198.366742 L90.7256684,134.394934 L78.9627488,208.414072 L24.6603127,208.414072 L24.6603127,205.656291 Z" id="Combined-Shape" fill="#420C5D"></path> - <path d="M11.826669,49.8521569 L46.8832045,56.105634 L66.9367645,37.5720833 L63.1995769,59.0161914 L77.9456043,59.9023344 C87.8749728,33.5743 78.4532943,16.3301361 49.6805686,8.1698428 C20.907843,0.00954948637 8.28987644,13.9036542 11.826669,49.8521569 Z" id="Path-17" fill="#55246D" transform="translate(46.506369, 32.903825) rotate(-10.000000) translate(-46.506369, -32.903825) "></path> - </g> - </g> - <g id="Group-23-Copy-7" transform="translate(370.000000, 258.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.963640, 79.812539) scale(-1, 1) rotate(-2.000000) translate(-54.963640, -79.812539) translate(2.963640, 1.812539)"> - <path d="M35.8989775,76.6397301 C39.8008103,64.1422795 40.3052562,56.8913132 37.4123152,54.8868313 C15.4803721,39.6904679 49.4393634,15.5951695 63.3861234,17.1984201 C89.3396199,20.1819056 81.0413851,45.7520246 73.2509058,55.8873283 C65.4604266,66.022632 61.7499311,60.5016435 58.849861,69.6131884 C56.9164808,75.6875517 55.5520608,78.1936418 54.7566009,77.1314588 L35.8989775,76.6397301 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.601964, 47.245458) rotate(-11.000000) translate(-55.601964, -47.245458) "></path> - <path d="M24.8752559,153.640615 L24.3685248,153.640615 L12.5030777,105.853502 L8.72585359,137.193183 L2.71699463,134.995535 L0.4372178,69.6855475 L28.9089927,70.6728018 L103.582307,71.4659842 L101.302531,136.775971 L95.2936716,138.97362 L91.5164476,107.633939 L79.6510005,155.421051 L24.8752559,155.421051 L24.8752559,153.640615 Z" id="Combined-Shape" fill="#420C5D"></path> - <path d="M23.8661526,44.6857613 L55.4680487,50.2677843 L73.5570663,33.66018 L70.1765274,52.8658267 L83.4703281,53.6517687 C92.4359909,30.0692483 83.9509572,14.631553 58.015227,7.33868285 C32.0794967,0.0458126581 20.696472,12.4948388 23.8661526,44.6857613 Z" id="Path-17" fill="#7D4698" transform="translate(55.136710, 29.484951) scale(-1, 1) rotate(-10.000000) translate(-55.136710, -29.484951) "></path> - </g> - </g> - <g id="Group-23-Copy-9" transform="translate(474.000000, 244.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.786430, 93.460752) scale(-1, 1) rotate(-2.000000) translate(-54.786430, -93.460752) translate(2.786430, 20.960752)"> - <path d="M35.0530534,66.0156524 C38.9535054,53.5871238 39.4572722,46.3759838 36.5643538,44.3822324 C14.6325821,29.2672185 48.5870776,5.30723748 62.5330127,6.90297672 C88.4849741,9.87248455 81.7988279,40.2173958 74.0097893,50.2963784 C66.2207507,60.3753611 60.9007805,49.9684822 58.0017208,59.0297729 C56.0690143,65.0706333 54.7049116,67.562849 53.9094125,66.50642 L35.0530534,66.0156524 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.182791, 36.784729) scale(-1, 1) rotate(-19.000000) translate(-55.182791, -36.784729) "></path> - <path d="M24.8752559,142.670229 L24.3685248,142.670229 L12.5030777,95.1485797 L8.72585359,126.314165 L2.71699463,124.128725 L0.4372178,59.1815429 L28.9089927,60.1633128 L103.582307,60.952089 L101.302531,125.899271 L95.2936716,128.084711 L91.5164476,96.9191258 L79.6510005,144.440775 L24.8752559,144.440775 L24.8752559,142.670229 Z" id="Combined-Shape" fill="#7D4698"></path> - </g> - <path d="M15.2294429,46.864359 L81.92566,56.8387658 C101.262505,33.0279984 96.4201515,17.0655739 67.3985995,8.95149223 C38.3770475,0.837410558 20.9873286,13.4750328 15.2294429,46.864359 Z" id="Path-17" fill="#2E2798" transform="translate(54.376651, 31.705378) rotate(-10.000000) translate(-54.376651, -31.705378) "></path> - </g> - <g id="Group-23-Copy-13" transform="translate(49.000000, 214.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.786430, 93.460752) scale(-1, 1) rotate(-2.000000) translate(-54.786430, -93.460752) translate(2.786430, 20.960752)"> - <path d="M35.0530534,66.0156524 C38.9535054,53.5871238 39.4572722,46.3759838 36.5643538,44.3822324 C14.6325821,29.2672185 48.5870776,5.30723748 62.5330127,6.90297672 C88.4849741,9.87248455 81.7988279,40.2173958 74.0097893,50.2963784 C66.2207507,60.3753611 60.9007805,49.9684822 58.0017208,59.0297729 C56.0690143,65.0706333 54.7049116,67.562849 53.9094125,66.50642 L35.0530534,66.0156524 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.182791, 36.784729) scale(-1, 1) rotate(-19.000000) translate(-55.182791, -36.784729) "></path> - <path d="M24.8752559,142.670229 L24.3685248,142.670229 L12.5030777,95.1485797 L8.72585359,126.314165 L2.71699463,124.128725 L0.4372178,59.1815429 L28.9089927,60.1633128 L103.582307,60.952089 L101.302531,125.899271 L95.2936716,128.084711 L91.5164476,96.9191258 L79.6510005,144.440775 L24.8752559,144.440775 L24.8752559,142.670229 Z" id="Combined-Shape" fill="#7D4698"></path> - </g> - <path d="M15.2294429,46.864359 L81.92566,56.8387658 C101.262505,33.0279984 96.4201515,17.0655739 67.3985995,8.95149223 C38.3770475,0.837410558 20.9873286,13.4750328 15.2294429,46.864359 Z" id="Path-17" fill="#2E2798" transform="translate(54.376651, 31.705378) rotate(-10.000000) translate(-54.376651, -31.705378) "></path> - </g> - <g id="Group-23" transform="translate(215.000000, 238.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.747925, 104.034769) scale(-1, 1) rotate(-2.000000) translate(-54.747925, -104.034769) translate(2.747925, 32.034769)"> - <path d="M35.8815044,64.431758 C39.7901608,51.8836374 40.2983898,44.6041783 37.4061914,42.5933807 C15.4798779,27.349137 49.4546688,3.14253741 63.4019981,4.74485115 C89.3565542,7.72659343 81.0443266,33.4005468 73.2478509,43.5793247 C65.4513752,53.7581027 61.7433507,48.217527 58.8383001,57.3660425 C56.9015997,63.4650529 55.5357532,65.9816034 54.7407606,64.915694 L35.8815044,64.431758 Z" id="Path-11-Copy-3" fill="#A9FEF8" transform="translate(55.605922, 34.911361) rotate(-11.000000) translate(-55.605922, -34.911361) "></path> - <path d="M24.8752559,141.73377 L24.3685248,141.73377 L12.5030777,93.7558035 L8.72585359,125.22065 L2.71699463,123.014225 L0.4372178,57.4434004 L28.9089927,58.4345977 L103.582307,59.2309479 L101.302531,124.801772 L95.2936716,127.008198 L91.5164476,95.543351 L79.6510005,143.521318 L24.8752559,143.521318 L24.8752559,141.73377 Z" id="Combined-Shape" fill="#42D3BC"></path> - <path d="" id="Path-2" stroke="#979797"></path> - </g> - <path d="M91.2175339,51.3613417 L26.5422805,73.0259291 C9.85687601,56.6925877 7.07386088,46.1441716 18.1932351,41.3806807 C34.8722963,34.2354443 29.4940562,21.8992964 51.8432227,13.5452668 C66.742667,7.97591371 79.8674374,20.581272 91.2175339,51.3613417 Z" id="Path-19" fill="#2E2798" transform="translate(51.370333, 42.645608) rotate(20.000000) translate(-51.370333, -42.645608) "></path> - </g> - <polygon id="Rectangle" fill="#7D4698" points="395 64 417 64 417 71 395 71"></polygon> - <polygon id="Rectangle-Copy" fill="#7D4698" points="391 54 418 54 418 61 391 61"></polygon> - <polygon id="Rectangle-Copy-2" fill="#7D4698" points="393 73 413 73 413 80 393 80"></polygon> - </g> - </g> - </g> - </g> -</svg> \ No newline at end of file diff --git a/public/dist/tor-header-campaign-2018.ab4c974a.svg b/public/dist/tor-header-campaign-2018.ab4c974a.svg deleted file mode 100644 index dae28991..00000000 --- a/public/dist/tor-header-campaign-2018.ab4c974a.svg +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="613px" height="350px" viewBox="0 0 613 350" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>59DCF220-ACE3-43CF-A8E0-C1DFFCA18BED(a)1.5x</title> - <desc>Created with sketchtool.</desc> - <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="donate.tpo.org---Iteration" transform="translate(-816.000000, -70.000000)"> - <g id="Hero"> - <g id="artwork" transform="translate(1123.000000, 275.000000) scale(-1, 1) translate(-1123.000000, -275.000000) translate(813.000000, 66.000000)"> - <g id="Group-23-Copy-5" transform="translate(505.000000, 74.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.348148, 128.441748) scale(-1, 1) rotate(-2.000000) translate(-56.348148, -128.441748) translate(4.348148, 25.941748)"> - <path d="M35.8212974,64.1902606 C39.7225678,51.6891259 40.2295616,44.4368403 37.3422789,42.4334038 C15.4532326,27.2449658 49.3679512,3.13027094 63.2911811,4.72727574 C89.2008905,7.69913866 80.904321,33.2769419 73.1218555,43.4173847 C65.33939,53.5578274 61.6375239,48.0377384 58.7379542,57.151995 C56.8049077,63.2281661 55.4415513,65.7352657 54.6478849,64.6732936 L35.8212974,64.1902606 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.509676, 34.781047) rotate(-11.000000) translate(-55.509676, -34.781047) "></path> - <path d="M24.8323685,201.727383 L24.3265111,201.727383 L12.4815212,119.478881 L8.71080938,173.418986 L2.71231027,169.636516 L0.436463994,57.2286238 L28.8591508,58.9278306 L103.403722,60.2930117 L101.127875,172.700904 L95.1293761,176.483374 L91.3586643,122.543269 L79.5136744,204.791771 L24.8323685,204.791771 L24.8323685,201.727383 Z" id="Combined-Shape" fill="#2E2798"></path> - </g> - <path d="M85.7624649,49.3501369 L21.1988594,70.9396812 C15.8436936,52.9412106 18.7162435,41.568607 29.8165092,36.8218706 C46.4669077,29.701766 24.1497249,20.0024263 46.4603827,11.6775464 C61.3341546,6.12762642 74.4348487,18.6851566 85.7624649,49.3501369 Z" id="Path-19" fill="#2E2798" transform="translate(52.173595, 40.670721) scale(-1, 1) rotate(20.000000) translate(-52.173595, -40.670721) "></path> - </g> - <g id="Group-23-Copy-11" transform="translate(0.000000, 166.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.362187, 127.638132) scale(-1, 1) rotate(-2.000000) translate(-56.362187, -127.638132) translate(4.362187, 25.138132)"> - <path d="M35.8920178,64.189094 C39.7981834,51.6880298 40.3048819,44.4354948 37.4121133,42.431489 C15.4814768,27.2387353 49.4527482,3.12853815 63.401098,4.72791764 C89.357553,7.70419961 81.0504063,33.2818067 73.2557261,43.421429 C65.4610459,53.5610513 61.7516575,48.0400968 58.8484201,57.1542929 C56.9129286,63.2304236 55.5475533,65.737413 54.7522942,64.675261 L35.8920178,64.189094 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.609284, 34.782273) rotate(-11.000000) translate(-55.609284, -34.782273) "></path> - <path d="M24.8774978,201.730168 L24.370721,201.730168 L12.5042045,119.480531 L8.72664002,173.42138 L2.7172395,169.638858 L0.437257204,57.2294139 L28.9115982,58.9286441 L103.591643,60.2938441 L101.311661,172.703288 L95.3022601,176.48581 L91.5246955,122.544961 L79.6581791,204.794599 L24.8774978,204.794599 L24.8774978,201.730168 Z" id="Combined-Shape" fill="#42D3BC"></path> - </g> - <path d="M85.3544074,48.6576394 L20.6740076,70.2680221 C15.3147749,52.2689634 18.1954784,40.8942139 29.3161182,36.1437737 C45.9970779,29.0181133 23.6443981,19.3239676 45.995661,10.9917856 C60.8965029,5.43699753 74.0160851,17.9922821 85.3544074,48.6576394 Z" id="Path-19" fill="#2E2798" transform="translate(51.707096, 39.990984) scale(-1, 1) rotate(20.000000) translate(-51.707096, -39.990984) "></path> - </g> - <g id="Group-23-Copy-7" transform="translate(449.000000, 107.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.963640, 79.812539) scale(-1, 1) rotate(-2.000000) translate(-54.963640, -79.812539) translate(2.963640, 1.812539)"> - <path d="M35.8989775,76.6397301 C39.8008103,64.1422795 40.3052562,56.8913132 37.4123152,54.8868313 C15.4803721,39.6904679 49.4393634,15.5951695 63.3861234,17.1984201 C89.3396199,20.1819056 81.0413851,45.7520246 73.2509058,55.8873283 C65.4604266,66.022632 61.7499311,60.5016435 58.849861,69.6131884 C56.9164808,75.6875517 55.5520608,78.1936418 54.7566009,77.1314588 L35.8989775,76.6397301 Z" id="Path-11-Copy-3" fill="#420C5D" transform="translate(55.601964, 47.245458) rotate(-11.000000) translate(-55.601964, -47.245458) "></path> - <path d="M24.8752559,153.640615 L24.3685248,153.640615 L12.5030777,105.853502 L8.72585359,137.193183 L2.71699463,134.995535 L0.4372178,69.6855475 L28.9089927,70.6728018 L103.582307,71.4659842 L101.302531,136.775971 L95.2936716,138.97362 L91.5164476,107.633939 L79.6510005,155.421051 L24.8752559,155.421051 L24.8752559,153.640615 Z" id="Combined-Shape" fill="#42D3BC"></path> - <path d="M23.8661526,44.6857613 L55.4680487,50.2677843 L73.5570663,33.66018 L70.1765274,52.8658267 L83.4703281,53.6517687 C92.4359909,30.0692483 83.9509572,14.631553 58.015227,7.33868285 C32.0794967,0.0458126581 20.696472,12.4948388 23.8661526,44.6857613 Z" id="Path-17" fill="#7D4698" transform="translate(55.136710, 29.484951) scale(-1, 1) rotate(-10.000000) translate(-55.136710, -29.484951) "></path> - </g> - </g> - <g id="Group-23-Copy-8" transform="translate(189.000000, 103.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.188944, 89.816249) scale(-1, 1) rotate(-2.000000) translate(-56.188944, -89.816249) translate(3.688944, 1.816249)"> - <path d="M36.1017614,96.5132318 C40.0215729,83.9798072 40.5269927,76.7075457 37.6180207,74.6964473 C15.5645438,59.4499233 49.7003022,35.2916262 63.7224152,36.9029674 C89.8161359,39.9015089 81.4794231,65.545156 73.6494962,75.7085213 C65.8195694,85.8718867 62.0878056,80.3336986 59.1743301,89.4714579 C57.2320131,95.5632974 55.8608595,98.0764613 55.0608692,97.0109496 L36.1017614,96.5132318 Z" id="Path-11-Copy-3" fill="#420C5D" transform="translate(55.901600, 67.037595) rotate(-11.000000) translate(-55.901600, -67.037595) "></path> - <path d="M25.0101309,173.740953 L24.5006523,173.740953 L12.5708701,125.814924 L8.77316565,157.24571 L2.73172633,155.041673 L0.439588419,89.5418308 L29.0657389,90.531955 L104.143936,91.3274432 L101.851799,156.827285 L95.8103592,159.031322 L92.0126548,127.600537 L80.0828726,175.526566 L25.0101309,175.526566 L25.0101309,173.740953 Z" id="Combined-Shape" fill="#7D4698"></path> - <path d="M91.8935109,48.9382881 L26.870061,70.6733826 C21.50079,52.6254727 24.4064459,41.2140291 35.5870286,36.4390517 C52.3579025,29.2765858 29.9026143,19.5742115 52.3732262,11.1963484 C67.3536342,5.61110627 80.5270624,18.1917529 91.8935109,48.9382881 Z" id="Path-19" fill="#2E2798" transform="translate(58.075321, 40.290906) rotate(20.000000) translate(-58.075321, -40.290906) "></path> - </g> - </g> - <g id="Group-24" transform="translate(293.000000, 90.000000)"> - <g id="Group-22"> - <g id="Group-2-Copy-4" transform="translate(56.255141, 90.803656) scale(-1, 1) rotate(-2.000000) translate(-56.255141, -90.803656) translate(3.755141, 1.803656)"> - <path d="M36.1152327,99.3255347 C40.0297886,86.8873928 40.5322964,79.6697051 37.6227561,77.6724716 C15.5649707,62.5310592 49.6885329,38.5671203 63.7101925,40.172059 C89.8030696,43.1586859 81.4771344,68.607255 73.6518308,78.6914831 C65.8265273,88.7757112 62.0928659,83.2774266 59.1832264,92.3456955 C57.2434668,98.3912081 55.8734124,100.885031 55.0730634,99.8271632 L36.1152327,99.3255347 Z" id="Path-11-Copy-3" fill="#2E2798" transform="translate(55.898559, 70.079441) rotate(-11.000000) translate(-55.898559, -70.079441) "></path> - <path d="M25.0101309,175.974975 L24.5006523,175.974975 L12.5708701,128.410965 L8.77316565,159.604331 L2.73172633,157.416943 L0.439588419,92.4118676 L29.0657389,93.3945128 L104.143936,94.1839921 L101.851799,159.189068 L95.8103592,161.376456 L92.0126548,130.18309 L80.0828726,177.747099 L25.0101309,177.747099 L25.0101309,175.974975 Z" id="Combined-Shape" fill="#5058AD"></path> - <path d="M32.4583644,38.6997267 C25.931787,36.8250835 21.1608099,30.8605783 21.1608099,23.7925008 C21.1608099,15.2212583 28.1768537,8.27289343 36.8315822,8.27289343 C45.4863108,8.27289343 52.5023546,15.2212583 52.5023546,23.7925008 C52.5023546,24.8976479 52.3857153,25.9758152 52.1639632,27.0155874 C54.3720099,25.9893813 56.3948165,25.1878247 58.2323831,24.6109176 C68.0240652,21.5368026 95.5674242,30.1857505 57.1454655,54.8317155 C31.5308263,71.2623588 23.0276871,66.0731585 31.6360478,39.2641145 C31.9115672,39.0742706 32.1856728,38.8861413 32.4583644,38.6997267 Z" id="Combined-Shape-Copy-2" fill="#42D3BC" transform="translate(49.063994, 36.234913) rotate(20.000000) translate(-49.063994, -36.234913) "></path> - </g> - </g> - </g> - <g id="Group-23-Copy-3" transform="translate(507.000000, 190.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.601972, 114.169847) scale(-1, 1) rotate(-2.000000) translate(-56.601972, -114.169847) translate(4.101972, 20.169847)"> - <path d="M36.1863761,64.3114811 C40.1056092,51.78552 40.6077034,44.5165744 37.6926587,42.5046442 C15.5931432,27.251814 49.7727136,3.12314988 63.8194533,4.74186389 C89.9590019,7.7541254 81.6229372,33.3823202 73.7856175,43.5369653 C65.9482978,53.6916104 62.2070433,48.1535861 59.2938954,57.285872 C57.3517968,63.3740626 55.9797701,65.8853942 55.1778152,64.819867 L36.1863761,64.3114811 Z" id="Path-11-Copy-3" fill="#7D4698" transform="translate(55.997894, 34.861178) rotate(-11.000000) translate(-55.997894, -34.861178) "></path> - <path d="M25.0551942,184.947192 L24.5447976,184.947192 L12.5935203,112.319571 L7.88289407,185.781914 L1.83056927,182.441893 L0.44038047,57.3509332 L29.1181096,58.8513782 L104.331583,60.0568695 L102.035315,159.316036 L95.9829905,162.656058 L92.1784434,115.025507 L80.2271661,187.653128 L25.0551942,187.653128 L25.0551942,184.947192 Z" id="Combined-Shape" fill="#A9FEF8"></path> - </g> - <path d="M55.7165892,2.63158118 C59.6235395,0.877193727 64.2520263,0 69.6020496,0 C88.4129503,0 97.8184006,18.7443485 97.8184006,56.2330455 L68.8739128,56.2330455 L69.6020496,32.5330377 L41.8311288,32.5330377 L42.5592655,56.2330455 L13.6147777,56.2330455 C13.6147777,18.7443485 23.0202281,0 41.8311288,0 C47.181152,0 51.8096388,0.877193727 55.7165892,2.63158118 Z" id="Combined-Shape" fill="#420C5D"></path> - </g> - <g id="Group-23-Copy-12" transform="translate(82.000000, 161.000000)"> - <g id="Group-2-Copy-2" transform="translate(56.601972, 114.169847) scale(-1, 1) rotate(-2.000000) translate(-56.601972, -114.169847) translate(4.101972, 20.169847)"> - <path d="M36.1863761,64.3114811 C40.1056092,51.78552 40.6077034,44.5165744 37.6926587,42.5046442 C15.5931432,27.251814 49.7727136,3.12314988 63.8194533,4.74186389 C89.9590019,7.7541254 81.6229372,33.3823202 73.7856175,43.5369653 C65.9482978,53.6916104 62.2070433,48.1535861 59.2938954,57.285872 C57.3517968,63.3740626 55.9797701,65.8853942 55.1778152,64.819867 L36.1863761,64.3114811 Z" id="Path-11-Copy-3" fill="#7D4698" transform="translate(55.997894, 34.861178) rotate(-11.000000) translate(-55.997894, -34.861178) "></path> - <path d="M25.0551942,184.947192 L24.5447976,184.947192 L12.5935203,112.319571 L7.88289407,185.781914 L1.83056927,182.441893 L0.44038047,57.3509332 L29.1181096,58.8513782 L104.331583,60.0568695 L102.035315,159.316036 L95.9829905,162.656058 L92.1784434,115.025507 L80.2271661,187.653128 L25.0551942,187.653128 L25.0551942,184.947192 Z" id="Combined-Shape" fill="#A9FEF8"></path> - </g> - <path d="M55.7165892,2.63158118 C59.6235395,0.877193727 64.2520263,0 69.6020496,0 C88.4129503,0 97.8184006,18.7443485 97.8184006,56.2330455 L68.8739128,56.2330455 L69.6020496,32.5330377 L41.8311288,32.5330377 L42.5592655,56.2330455 L13.6147777,56.2330455 C13.6147777,18.7443485 23.0202281,0 41.8311288,0 C47.181152,0 51.8096388,0.877193727 55.7165892,2.63158118 Z" id="Combined-Shape" fill="#420C5D"></path> - </g> - <g id="Group-23-Copy" transform="translate(371.000000, 78.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.614088, 137.885799) scale(-1, 1) rotate(-2.000000) translate(-54.614088, -137.885799) translate(2.614088, 66.385799)"> - <path d="M35.8356178,64.1531094 C39.7386129,51.6592193 40.2458855,44.4111544 37.3574358,42.4089147 C15.4595418,27.2295494 49.3884319,3.12856117 63.3173679,4.72449387 C89.2376959,7.6943617 80.9374684,33.2573453 73.1517063,43.3919585 C65.3659441,53.5265716 61.6626103,48.0097367 58.7617605,57.118712 C56.8278606,63.1913622 55.4639196,65.6970147 54.6699373,64.6356696 L35.8356178,64.1531094 Z" id="Path-11-Copy-3" fill="#A9FEF8" transform="translate(55.532455, 34.760802) rotate(-11.000000) translate(-55.532455, -34.760802) "></path> - <path d="M24.8425253,141.121832 L24.3364609,141.121832 L12.4866263,93.3510113 L8.71437221,124.680008 L2.71341964,122.483109 L0.436642513,57.1953876 L28.8709546,58.1823054 L103.446015,58.9752173 L101.169238,124.262939 L95.1682852,126.459838 L91.3960312,95.130841 L79.5461965,142.901662 L24.8425253,142.901662 L24.8425253,141.121832 Z" id="Combined-Shape" fill="#7D4698"></path> - </g> - <path d="M24.6833561,29.2724984 C37.9883586,15.3144778 50.1848218,11.8216104 61.2727458,18.7938961 C77.9046317,29.2523246 76.9462099,51.505195 96.5827071,48.5975257 C116.219204,45.6898564 118.573394,90.5452943 96.5655186,93.9023511 C74.5576433,97.2594078 63.3485919,87.5239802 44.0086673,77.6570881 C31.1153841,71.07916 24.6736138,54.9509634 24.6833561,29.2724984 Z" id="Path-3" fill="#2E2798" transform="translate(68.443187, 54.944117) rotate(-70.000000) translate(-68.443187, -54.944117) "></path> - </g> - <g id="Group-23-Copy-2" transform="translate(433.000000, 200.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.795826, 87.114546) scale(-1, 1) rotate(-2.000000) translate(-54.795826, -87.114546) translate(2.795826, 14.114546)"> - <path d="M35.0923015,66.7066247 C38.9814313,54.1464449 39.4791186,46.8575055 36.5853633,44.8398066 C14.6472472,29.543242 48.5725572,5.3507103 62.5159246,6.97496537 C88.463108,9.99753825 81.8038159,40.6661634 74.0252468,50.8481909 C66.2466777,61.0302183 60.9196169,50.5062012 58.0288273,59.6634306 C56.1016343,65.7682502 54.7399639,68.2863973 53.9438162,67.217872 L35.0923015,66.7066247 Z" id="Path-11-Copy-3" fill="#7D4698" transform="translate(55.187099, 37.176913) scale(-1, 1) rotate(-19.000000) translate(-55.187099, -37.176913) "></path> - <path d="M24.8752559,144.17724 L24.3685248,144.17724 L12.5030777,96.1536243 L8.72585359,127.648409 L2.71699463,125.439884 L0.4372178,59.8066714 L28.9089927,60.7988117 L103.582307,61.5959197 L101.302531,127.229132 L95.2936716,129.437657 L91.5164476,97.9428726 L79.6510005,145.966488 L24.8752559,145.966488 L24.8752559,144.17724 Z" id="Combined-Shape" fill="#42D3BC"></path> - </g> - <path d="M20.1156416,35.6470241 L74.1904238,43.0920556 C89.8593993,25.3866075 85.9284876,13.5104044 62.3976887,7.46344617 C38.8668898,1.41648797 24.7728741,10.8110139 20.1156416,35.6470241 Z" id="Path-17" fill="#5058AD" transform="translate(51.850447, 24.389744) rotate(-10.000000) translate(-51.850447, -24.389744) "></path> - </g> - <g id="Group-23-Copy-10" transform="translate(363.000000, 168.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.750448, 96.891493) scale(-1, 1) rotate(-2.000000) translate(-54.750448, -96.891493) translate(2.750448, 25.391493)"> - <path d="M35.9043237,64.0405307 C39.8040692,51.5679656 40.307358,44.3311594 37.4141902,42.3301123 C15.4805279,27.1597886 49.4346835,3.11665172 63.3812678,4.71899518 C89.3344375,7.7007928 81.0404829,33.2199457 73.2518384,43.3343357 C65.463194,53.4487258 61.7519432,47.9378713 58.8533965,57.0312641 C56.921032,63.093526 55.5570485,65.5945339 54.7614458,64.5342876 L35.9043237,64.0405307 Z" id="Path-11-Copy-3" fill="#50E3C2" transform="translate(55.600755, 34.706925) rotate(-11.000000) translate(-55.600755, -34.706925) "></path> - <path d="M24.8752559,140.891501 L24.3685248,140.891501 L12.5030777,93.1986491 L8.72585359,124.476513 L2.71699463,122.283199 L0.4372178,57.1020366 L28.9089927,58.0873435 L103.582307,58.8789614 L101.302531,124.060124 L95.2936716,126.253437 L91.5164476,94.9755739 L79.6510005,142.668426 L24.8752559,142.668426 L24.8752559,140.891501 Z" id="Combined-Shape" fill="#A9FEF8"></path> - </g> - <path d="M92.8295381,49.2031697 L28.1564785,70.8224066 C22.8133935,52.8624718 25.7019461,41.507527 36.8221366,36.7575721 C53.5024222,29.6326398 31.1657556,19.9748477 53.5151607,11.6412828 C68.4147641,6.08557287 81.5195565,18.6062018 92.8295381,49.2031697 Z" id="Path-19" fill="#2E2798" transform="translate(59.192452, 40.591520) rotate(20.000000) translate(-59.192452, -40.591520) "></path> - </g> - <g id="Group-21" transform="translate(223.000000, 65.000000)"> - <g id="Group-2-Copy-3" transform="translate(103.786494, 140.916899) scale(-1, 1) rotate(-2.000000) translate(-103.786494, -140.916899) translate(36.786494, 2.416899)"> - <path d="M70.0527866,194.897685 C73.9316108,182.383455 74.4360383,175.123677 71.5660691,173.118349 C49.8082795,157.915575 83.522599,133.774061 97.3628413,135.371887 C123.118119,138.345277 114.869347,163.949891 107.132581,174.101229 C99.395814,184.252566 95.7163299,178.727015 92.833454,187.850822 C90.9115368,193.93336 89.5561405,196.44312 88.7672652,195.380102 L70.0527866,194.897685 Z" id="Path-11-Copy-3" fill="#42D3BC" transform="translate(89.626313, 165.456869) rotate(-11.000000) translate(-89.626313, -165.456869) "></path> - <path d="M54.9312326,275.050779 L54.4283926,275.050779 L41.8553201,244.656105 L0.356586957,0.605746658 L12.9107244,5.08520228 L59.1293467,191.97877 L133.033909,192.770874 L130.771638,258.16453 L124.80892,260.364994 L121.0607,228.985164 L109.286366,276.833497 L54.9312326,276.833497 L54.9312326,275.050779 Z" id="Combined-Shape" fill="#7D4698"></path> - </g> - <path d="M25.9647891,129.020196 C4.96517701,107.261018 4.97427469,94.535694 25.9920822,90.8442255 C57.5187935,85.3070228 53.1574039,114.094694 69.8023514,96.3275814 C86.447299,78.5604685 147.652611,90.0428473 125.852902,110.249179 C104.053193,130.455511 137.760649,143.323449 104.031085,161.378047 C81.5447095,173.414446 66.7435151,168.40738 59.6275024,146.356848 L25.9647891,129.020196 Z" id="Path-2-Copy" fill="#A9FEF8" transform="translate(70.356497, 127.646645) rotate(-50.000000) translate(-70.356497, -127.646645) "></path> - </g> - <g id="onion" transform="translate(385.694465, 46.224865) scale(-1, 1) rotate(-6.000000) translate(-385.694465, -46.224865) translate(356.194465, 3.224865)" fill="#42D3BC" fill-rule="nonzero"> - <path d="M35.4175775,48.857701 C34.2855876,45.3773252 32.5420623,42.2472913 30.7316016,39.3797293 C30.3856161,41.2956534 29.9457877,43.1689157 29.3395502,44.1946451 C28.5551677,45.5029077 28.3567497,46.1258105 27.4706572,46.8025885 C24.8743109,50.4618144 24.016802,51.0005669 22.392299,57.6539216 C22.0476281,59.0637367 21.4795285,61.2678542 21.7751308,62.6767158 C22.6612234,66.7364303 23.3500888,69.5279309 24.9098022,72.4576955 C24.9098022,72.4576955 25.2125505,72.7478114 25.2125505,72.860568 C26.4706877,74.5634755 26.6750146,75.1299714 28.9579242,76.6227828 C30.7553931,75.2554973 32.3144709,73.599103 33.5880807,70.9605761 C32.1518381,68.8414353 30.8160746,66.0571531 30.368906,63.1215313 C30.0891864,61.7485207 30.2202506,60.5271855 30.5396568,59.1071632 C31.8206973,53.8428073 33.1185909,51.4646939 35.4175775,48.857701 Z M36.3012503,52.3238774 C35.3430894,53.7610192 34.7348292,55.1393056 33.8394783,58.8063274 C33.5597587,59.9504707 33.0987143,61.7392345 33.3386 12,62.8826039 C33.788186,64.9423687 34.1752006,66.5998626 34.7114586,68.133995 C35.55978,65.5369278 36.225463,62.2091771 36.6861887,57.8221841 C36.7693718,55.8996821 36.6222043,54.0699554 36.3012503,52.3238774 Z M30.6392972,35.0787913 C30.8438052,34.169899 31.1098759,33.2215141 31.3393116,32.279478 C28.4379882,31.2930249 26.7945265,30.4341684 26.4089266,29.7029086 C26.1472937,29.2067423 27.2326782,28.2098305 29.6650803,26.7121733 L29.6904341,26.7203549 L29.6552599,26.7054292 L29.6650803,26.7121733 L31.835078,28.8160171 C31.8408319,29.0402441 31.8354142,29.2689415 31.8206147,29.5012738 C30.401046,29.5755384 26.610579,29.1199012 26.8034247,29.7444049 C27.3526776,32.0048974 26.4175714,33.2965583 25.9289739,34.2729795 C23.4263633,38.7934478 21.1281739,40.1495883 18.0153972,42.7146312 C12.5202879,47.2350996 6.99420583,50.0403731 7.6652854,62.4419551 C7.9706266,68.5510452 11.3639662,76.1196008 18.5058015,79.601653 C19.7234561,80.192618 20.87911,80.7069053 22.0287626,81.1436591 C24.0380869 ,79.7331391 25.9029709,78.7070249 27.5910054,77.5882169 C25.8490268,76.7608875 24.4599663,75.7262909 23.2902061,74.179558 C23.2902061,74.1232989 22.9298142,73.8081525 22.9298142,73.8081525 C20.862265,71.1024708 18.7542223,67.1619494 18.1158546,62.9711225 C17.7711837,61.2792967 17.9326812,59.7743656 18.3262539,58.0246119 C19.9998254,51.1471743 21.6967402,48.2674708 24.8623772,44.810873 C25.6994012,44.1908309 26.4592493,43.2039126 27.2467283,42.2076973 C28.097963,41.02179 29.5807976,37.9168836 30.6392972,35.0787913 Z M32.3482049,27.5780124 L37.232793,29.1542594 C35.6454317,34.4083352 38.1513977,36.3637607 39.6775874,37.2213581 C43.0949311,39.1153052 46.3935453,41.070214 49.0184988,43.451855 C53.963839,47.9723234 56.7720489,54.3268103 56.7720489,61.048101 C56.7720489,67.7073966 53.7186368,74.1212954 48.5926214,78.3989501 C43.7711728,82.4312078 37.1171608,84.1412364 30.6464051,84.1412364 C26.6173467,84.1412364 23.0167467,83.9583512 19.1089987,82.6747965 C10.1965459,79.6809549 3.54253389 ,72.0452381 2.99276486,62.8803114 C2.50416732,55.7328051 4.0915286,50.2953275 9.64677687,44.612453 C12.5143515,41.6186114 16.2620727,37.511443 20.2291854,34.7629983 C22.1830594,33.4187401 23.1174086,31.6864967 19.1495216,24.5389904 L22.453298,21.7595482 L26.9646021,24.8576447 C25.7124432,13.910884 22.8910363,13.1839857 37.6919663,1.3965173 L37.6922244,1.39755055 C33.5418554,6.22282762 37.4592307,9.07459736 35.1392828,13.8998744 C39.0470308,8.4004018 48.1324157,6.50697134 54.0534023,4.4895509 C46.247612,11.4540244 40.0775396,20.6671751 32.3482043,27.5780122 Z" id="Combined-Shape" transform="translate(29.840713, 42.768877) rotate(-3.000000) translate(-29.840713, -42.768877) "></path> - </g> - <g id="Group-23-Copy-6" transform="translate(290.000000, 239.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.741380, 92.167466) scale(-1, 1) rotate(-2.000000) translate(-54.741380, -92.167466) translate(2.741380, 20.167466)"> - <path d="M35.8825554,64.2637833 C39.7908008,51.748347 40.2988018,44.4877966 37.4065582,42.482132 C15.4799028,27.2768025 49.453745,3.13403993 63.4010416,4.73260944 C89.3555367,7.70738412 81.0441518,33.3144546 73.2480367,43.4665822 C65.4519217,53.6187099 61.7437478,48.0924044 58.8389972,57.2170889 C56.9024967,63.300212 55.5367361,65.8101902 54.7417152,64.7470237 L35.8825554,64.2637833 Z" id="Path-11-Copy-3" fill="#2E2798" transform="translate(55.605683, 34.820680) rotate(-11.000000) translate(-55.605683, -34.820680) "></path> - <path d="M24.8752559,141.365071 L24.3685248,141.365071 L12.5030777,93.5119121 L8.72585359,124.894908 L2.71699463,122.694222 L0.4372178,57.2939702 L28.9089927,58.282589 L103.582307,59.0768677 L101.302531,124.47712 L95.2936716,126.677806 L91.5164476,95.2948096 L79.6510005,143.147969 L24.8752559,143.147969 L24.8752559,141.365071 Z" id="Combined-Shape" fill="#50E3C2"></path> - </g> - <path d="M52.9763434,2.6289674 C56.8552353,0.876322467 61.4504818,0 66.7620829,0 C85.4378898,0 94.7757932,18.725731 94.7757932,56.1771929 L66.0391754,56.1771929 L66.7620829,32.5007247 L39.1906039,32.5007247 L39.9135114,56.1771929 L11.1768936,56.1771929 C11.1768936,18.725731 20.514797,0 39.1906039,0 C44.502205,0 49.0974515,0.876322467 52.9763434,2.6289674 Z" id="Combined-Shape" fill="#420C5D"></path> - </g> - <g id="Group-23-Copy-4" transform="translate(132.000000, 193.000000)"> - <g id="Group-2-Copy-2" transform="translate(55.342352, 106.297683) scale(-1, 1) rotate(-2.000000) translate(-55.342352, -106.297683) translate(3.842352, 1.797683)"> - <path d="M35.610391,82.5466625 C39.470061,70.0772996 39.9654618,62.8415274 37.0965935,60.839346 C15.3471506,45.6604226 48.9931879,21.6358407 62.8187534,23.2445395 C88.5467194,26.2381638 80.337511,51.7506172 72.6217647,61.8602437 C64.9060184,71.9698702 61.2245173,66.4578853 58.3556719,75.5489176 C56.4431083,81.6096058 55.0922432,84.1096989 54.3030766,83.0491969 L35.610391,82.5466625 Z" id="Path-11-Copy-3" fill="#42D3BC" transform="translate(55.116611, 53.226907) rotate(-11.000000) translate(-55.116611, -53.226907) "></path> - <path d="M24.6603127,205.656291 L24.1579602,205.656291 L12.3950406,131.637153 L8.65045487,180.180286 L2.69351751,176.776271 L0.43343987,75.6153375 L28.6591947,77.1445304 L102.687269,78.3731185 L99.8921122,194.962727 L93.9351748,198.366742 L90.7256684,134.394934 L78.9627488,208.414072 L24.6603127,208.414072 L24.6603127,205.656291 Z" id="Combined-Shape" fill="#420C5D"></path> - <path d="M11.826669,49.8521569 L46.8832045,56.105634 L66.9367645,37.5720833 L63.1995769,59.0161914 L77.9456043,59.9023344 C87.8749728,33.5743 78.4532943,16.3301361 49.6805686,8.1698428 C20.907843,0.00954948637 8.28987644,13.9036542 11.826669,49.8521569 Z" id="Path-17" fill="#55246D" transform="translate(46.506369, 32.903825) rotate(-10.000000) translate(-46.506369, -32.903825) "></path> - </g> - </g> - <g id="Group-23-Copy-7" transform="translate(370.000000, 258.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.963640, 79.812539) scale(-1, 1) rotate(-2.000000) translate(-54.963640, -79.812539) translate(2.963640, 1.812539)"> - <path d="M35.8989775,76.6397301 C39.8008103,64.1422795 40.3052562,56.8913132 37.4123152,54.8868313 C15.4803721,39.6904679 49.4393634,15.5951695 63.3861234,17.1984201 C89.3396199,20.1819056 81.0413851,45.7520246 73.2509058,55.8873283 C65.4604266,66.022632 61.7499311,60.5016435 58.849861,69.6131884 C56.9164808,75.6875517 55.5520608,78.1936418 54.7566009,77.1314588 L35.8989775,76.6397301 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.601964, 47.245458) rotate(-11.000000) translate(-55.601964, -47.245458) "></path> - <path d="M24.8752559,153.640615 L24.3685248,153.640615 L12.5030777,105.853502 L8.72585359,137.193183 L2.71699463,134.995535 L0.4372178,69.6855475 L28.9089927,70.6728018 L103.582307,71.4659842 L101.302531,136.775971 L95.2936716,138.97362 L91.5164476,107.633939 L79.6510005,155.421051 L24.8752559,155.421051 L24.8752559,153.640615 Z" id="Combined-Shape" fill="#420C5D"></path> - <path d="M23.8661526,44.6857613 L55.4680487,50.2677843 L73.5570663,33.66018 L70.1765274,52.8658267 L83.4703281,53.6517687 C92.4359909,30.0692483 83.9509572,14.631553 58.015227,7.33868285 C32.0794967,0.0458126581 20.696472,12.4948388 23.8661526,44.6857613 Z" id="Path-17" fill="#7D4698" transform="translate(55.136710, 29.484951) scale(-1, 1) rotate(-10.000000) translate(-55.136710, -29.484951) "></path> - </g> - </g> - <g id="Group-23-Copy-9" transform="translate(474.000000, 244.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.786430, 93.460752) scale(-1, 1) rotate(-2.000000) translate(-54.786430, -93.460752) translate(2.786430, 20.960752)"> - <path d="M35.0530534,66.0156524 C38.9535054,53.5871238 39.4572722,46.3759838 36.5643538,44.3822324 C14.6325821,29.2672185 48.5870776,5.30723748 62.5330127,6.90297672 C88.4849741,9.87248455 81.7988279,40.2173958 74.0097893,50.2963784 C66.2207507,60.3753611 60.9007805,49.9684822 58.0017208,59.0297729 C56.0690143,65.0706333 54.7049116,67.562849 53.9094125,66.50642 L35.0530534,66.0156524 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.182791, 36.784729) scale(-1, 1) rotate(-19.000000) translate(-55.182791, -36.784729) "></path> - <path d="M24.8752559,142.670229 L24.3685248,142.670229 L12.5030777,95.1485797 L8.72585359,126.314165 L2.71699463,124.128725 L0.4372178,59.1815429 L28.9089927,60.1633128 L103.582307,60.952089 L101.302531,125.899271 L95.2936716,128.084711 L91.5164476,96.9191258 L79.6510005,144.440775 L24.8752559,144.440775 L24.8752559,142.670229 Z" id="Combined-Shape" fill="#7D4698"></path> - </g> - <path d="M15.2294429,46.864359 L81.92566,56.8387658 C101.262505,33.0279984 96.4201515,17.0655739 67.3985995,8.95149223 C38.3770475,0.837410558 20.9873286,13.4750328 15.2294429,46.864359 Z" id="Path-17" fill="#2E2798" transform="translate(54.376651, 31.705378) rotate(-10.000000) translate(-54.376651, -31.705378) "></path> - </g> - <g id="Group-23-Copy-13" transform="translate(49.000000, 214.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.786430, 93.460752) scale(-1, 1) rotate(-2.000000) translate(-54.786430, -93.460752) translate(2.786430, 20.960752)"> - <path d="M35.0530534,66.0156524 C38.9535054,53.5871238 39.4572722,46.3759838 36.5643538,44.3822324 C14.6325821,29.2672185 48.5870776,5.30723748 62.5330127,6.90297672 C88.4849741,9.87248455 81.7988279,40.2173958 74.0097893,50.2963784 C66.2207507,60.3753611 60.9007805,49.9684822 58.0017208,59.0297729 C56.0690143,65.0706333 54.7049116,67.562849 53.9094125,66.50642 L35.0530534,66.0156524 Z" id="Path-11-Copy-3" fill="#55246D" transform="translate(55.182791, 36.784729) scale(-1, 1) rotate(-19.000000) translate(-55.182791, -36.784729) "></path> - <path d="M24.8752559,142.670229 L24.3685248,142.670229 L12.5030777,95.1485797 L8.72585359,126.314165 L2.71699463,124.128725 L0.4372178,59.1815429 L28.9089927,60.1633128 L103.582307,60.952089 L101.302531,125.899271 L95.2936716,128.084711 L91.5164476,96.9191258 L79.6510005,144.440775 L24.8752559,144.440775 L24.8752559,142.670229 Z" id="Combined-Shape" fill="#7D4698"></path> - </g> - <path d="M15.2294429,46.864359 L81.92566,56.8387658 C101.262505,33.0279984 96.4201515,17.0655739 67.3985995,8.95149223 C38.3770475,0.837410558 20.9873286,13.4750328 15.2294429,46.864359 Z" id="Path-17" fill="#2E2798" transform="translate(54.376651, 31.705378) rotate(-10.000000) translate(-54.376651, -31.705378) "></path> - </g> - <g id="Group-23" transform="translate(215.000000, 238.000000)"> - <g id="Group-2-Copy-2" transform="translate(54.747925, 104.034769) scale(-1, 1) rotate(-2.000000) translate(-54.747925, -104.034769) translate(2.747925, 32.034769)"> - <path d="M35.8815044,64.431758 C39.7901608,51.8836374 40.2983898,44.6041783 37.4061914,42.5933807 C15.4798779,27.349137 49.4546688,3.14253741 63.4019981,4.74485115 C89.3565542,7.72659343 81.0443266,33.4005468 73.2478509,43.5793247 C65.4513752,53.7581027 61.7433507,48.217527 58.8383001,57.3660425 C56.9015997,63.4650529 55.5357532,65.9816034 54.7407606,64.915694 L35.8815044,64.431758 Z" id="Path-11-Copy-3" fill="#A9FEF8" transform="translate(55.605922, 34.911361) rotate(-11.000000) translate(-55.605922, -34.911361) "></path> - <path d="M24.8752559,141.73377 L24.3685248,141.73377 L12.5030777,93.7558035 L8.72585359,125.22065 L2.71699463,123.014225 L0.4372178,57.4434004 L28.9089927,58.4345977 L103.582307,59.2309479 L101.302531,124.801772 L95.2936716,127.008198 L91.5164476,95.543351 L79.6510005,143.521318 L24.8752559,143.521318 L24.8752559,141.73377 Z" id="Combined-Shape" fill="#42D3BC"></path> - <path d="" id="Path-2" stroke="#979797"></path> - </g> - <path d="M91.2175339,51.3613417 L26.5422805,73.0259291 C9.85687601,56.6925877 7.07386088,46.1441716 18.1932351,41.3806807 C34.8722963,34.2354443 29.4940562,21.8992964 51.8432227,13.5452668 C66.742667,7.97591371 79.8674374,20.581272 91.2175339,51.3613417 Z" id="Path-19" fill="#2E2798" transform="translate(51.370333, 42.645608) rotate(20.000000) translate(-51.370333, -42.645608) "></path> - </g> - <polygon id="Rectangle" fill="#7D4698" points="395 64 417 64 417 71 395 71"></polygon> - <polygon id="Rectangle-Copy" fill="#7D4698" points="391 54 418 54 418 61 391 61"></polygon> - <polygon id="Rectangle-Copy-2" fill="#7D4698" points="393 73 413 73 413 80 393 80"></polygon> - </g> - </g> - </g> - </g> -</svg> \ No newline at end of file diff --git a/public/dist/twitter.74a014ed.svg b/public/dist/twitter.74a014ed.svg deleted file mode 100644 index 174815bc..00000000 --- a/public/dist/twitter.74a014ed.svg +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="20px" height="17px" viewBox="0 0 20 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>8580D1FC-3CAB-42E4-BF3F-F823A360A09D</title> - <desc>Created with sketchtool.</desc> - <defs></defs> - <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Footer" transform="translate(-1129.000000, -366.000000)" fill="#FFFFFF" fill-rule="nonzero"> - <g id="span2"> - <g transform="translate(1020.000000, 118.000000)"> - <g id="social-media" transform="translate(0.000000, 245.000000)"> - <g id="twitter" transform="translate(109.000000, 3.000000)"> - <path d="M17.9441406,4.05140625 C17.9568359,4.2290625 17.9568359,4.40675781 17.9568359,4.58441406 C17.9568359,10.0031641 13.8325,16.2468359 6.29441406,16.2468359 C3.97207031,16.2468359 1.81472656,15.5742187 0,14.4067578 C0.329960937,14.4448047 0.6471875,14.4575 0.98984375,14.4575 C2.90605469,14.4575 4.67003906,13.8103125 6.07867187,12.70625 C4.27664062,12.6681641 2.76648437,11.4879687 2.24617187,9.86359375 C2.5,9.90164062 2.75378906,9.92703125 3.0203125,9.92703125 C3.38832031,9.92703125 3.75636719,9.87625 4.09898437,9.78746094 C2.22082031,9.40671875 0.812148438,7.75699219 0.812148438,5.76460937 L0.812148438,5.71386719 C1.3578125,6.0184375 1.99238281,6.20878906 2.66492187,6.23414062 C1.56085937,5.49808594 0.837539062,4.24175781 0.837539062,2.82042969 C0.837539062,2.05902344 1.04054687,1.36105469 1.39589844,0.751914062 C3.41367187,3.23921875 6.44667969,4.86355469 9.84765625,5.04125 C9.78421875,4.73667969 9.74613281,4.41945312 9.74613281,4.1021875 C9.7461328 1,1.84328125 11.5735547,0.003203125 13.8451172,0.003203125 C15.0253125,0.003203125 16.0912891,0.498125 16.8400391,1.29761719 C17.7664062,1.11996094 18.6547266,0.777304687 19.4415625,0.307773437 C19.1369531,1.25957031 18.4897656,2.0590625 17.6395312,2.56664062 C18.4644141,2.47785156 19.2639062,2.249375 19.9999219,1.93214844 C19.4416406,2.74429687 18.7436328,3.46761719 17.9441406,4.05140625 Z" id="Shape"></path> - </g> - </g> - </g> - </g> - </g> - </g> -</svg> \ No newline at end of file diff --git a/templates/champions-of-privacy.twig b/templates/champions-of-privacy.twig index 3a708d2a..3bb5c8c1 100644 --- a/templates/champions-of-privacy.twig +++ b/templates/champions-of-privacy.twig @@ -14,7 +14,7 @@ {% block content %} <div class="fixed-width"> - <p>{% trans %}Champions of Privacy make a significant pledge of $1,000 or more—creating a steady, reliable source of funds to help us be agile in our defense against the growing threats to privacy, freedom of expression, and access to information online.{% endtrans %}</p> + <p>{% trans %}Champions of Privacy make a significant pledge of $1,000 or more—creating a steady, reliable source of funds to help us be agile in our defense against the growing threats to privacy, freedom of expression, and access to information online.{% endtrans %}</p> <p>{% trans %}As a Champion of Privacy, you'll receive exclusive gifts and invitations to online events that will give you insider access to what's happening at Tor.{% endtrans %}</p> <p>{% trans %}We believe everyone in the world should be able to enjoy the luxury our tools provide: private access to the open web.{% endtrans %} {% trans %}The Tor Project counts on the support of our Champions of Privacy to keep our software strong and available to everyone who needs it.{% endtrans %} {% trans %}With your help, we can make the Tor network accessible to all.{% endtrans %}</p> <p>{% trans %}We're standing up for the universal human right to privacy.{% endtrans %} {% trans %}Join us by becoming a Champion of Privacy today.{% endtrans %}</p> diff --git a/translation/out/messages.pot b/translation/out/messages.pot index ea249e84..2301e539 100644 --- a/translation/out/messages.pot +++ b/translation/out/messages.pot @@ -1,23 +1,15 @@ -#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:92 -#: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43 -#: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:66 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:511 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:656 -msgid "Tor: Strength in Numbers" +#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:101 +msgid "Tracking, surveillance, and censorship are widespread online." msgstr "" -#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:99 -#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:107 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:663 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:671 -msgid "" -"Stand up for the universal human rights to privacy and freedom and help keep " -"Tor robust and secure." +#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:105 +#: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43 +#: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:66 +msgid "Take back the internet with Tor" msgstr "" -#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:101 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:665 -msgid "Mozilla will match your gift and double your impact." +#: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:112 +msgid "Give today, and Mozilla will match your donation." msgstr "" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:47 @@ -31,22 +23,22 @@ msgid "Fit" msgstr "" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:58 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:527 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:514 msgid "Select Fit" msgstr "" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:62 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:519 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:506 msgid "Slim" msgstr "" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:66 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:515 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:502 msgid "Classic" msgstr "" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:74 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:523 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:510 msgid "European" msgstr "" @@ -55,7 +47,7 @@ msgid "Size" msgstr "" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:88 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:531 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:518 msgid "Select Size" msgstr "" @@ -81,12 +73,12 @@ msgstr "" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:47 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:70 -msgid "Donate to the Tor Project and protect the privacy of millions." +msgid "Privacy and freedom online should be the default." msgstr "" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:49 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:72 -msgid "Anonymity loves company." +msgid "Donate to the Tor Project." msgstr "" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:58 @@ -182,13 +174,13 @@ msgid "Email" msgstr "" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:192 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:342 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:325 #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:47 msgid "First Name" msgstr "" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:196 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:346 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:329 #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:51 msgid "Last Name" msgstr "" @@ -199,7 +191,7 @@ msgid "Report Donation" msgstr "" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:204 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:392 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:375 msgid "Start sending me email updates about the Tor Project!" msgstr "" @@ -209,7 +201,7 @@ msgid "Wallet Addresses" msgstr "" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:212 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:333 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:316 #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:42 msgid "Your Info" msgstr "" @@ -325,7 +317,7 @@ msgid "" msgstr "" #: tmp/cache_locale/c8/c806c3e41d2762077fdd1ce236b4b0b7dc838a7c1a428d6d6daeede2a01d35aa.php:134 -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:677 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:694 msgid "Back to Donate Page" msgstr "" @@ -403,233 +395,232 @@ msgstr "" msgid "Want to donate stock or via postal mail?" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:188 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:187 msgid "invalid amount" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:192 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:191 msgid "$2 minimum donation" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:196 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:195 msgid "$ other" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:203 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:202 msgid "Choose your gift as a token of our thanks." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:210 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:209 msgid "No thanks, I don't want a gift." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:212 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:211 #, php-format msgid "I would prefer 100% of my donation to go to the Tor Project's work." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:223 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:222 msgid "sticker Pack" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:230 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:229 msgid "" "A collection of our favorite logo stickers for decorating your stuff and " "covering your cams." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:240 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:239 msgid "t-shirt" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:248 -msgid "Get our limited edition Tor: Strength in Numbers shirt." +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:247 +msgid "Get our limited edition Take Back the Internet With Tor shirt." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:259 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:258 msgid "t-shirt pack" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:269 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:266 msgid "" -"Our Tor: Strength in Numbers t-shirt, plus one of either our Tor: Powering " -"the Digital Resistance, Open Observatory of Network Interference (OONI), or " -"Tor at the Heart of Internet Freedom t-shirts." -msgstr "" - -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:275 -msgid "Tor at the Heart of Internet Freedom" +"Get this year's Take Back the Internet With Tor t-shirt and the Tor: " +"Strength in Numbers t-shirt." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:279 -msgid "Powering the Digital Resistance" -msgstr "" - -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:283 -msgid "Open Observatory of Network Interference" -msgstr "" - -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:294 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:277 msgid "sweatshirt" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:301 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:284 msgid "Your generous support of Tor gets you this high-quality zip hoodie." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:311 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:294 msgid "how do you want to <span class=\"green\">DONATE</span>?" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:317 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:300 msgid "Credit Card" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:326 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:309 msgid "Want to donate Bitcoin, Stock, or via snail mail?" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:337 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:320 msgid "* required fields" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:352 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:335 msgid "Street Address" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:356 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:339 msgid "Apt." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:366 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:349 msgid "City" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:370 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:353 msgid "State" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:375 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:358 msgid "Zip" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:381 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:364 msgid "Enter email" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:385 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:368 msgid "We‘ll email you your receipt" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:399 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:382 msgid "Card Number" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:406 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:389 msgid "MM" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:410 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:393 msgid "YY" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:414 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:397 msgid "CVC" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:422 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:495 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:405 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:478 msgid "Choose your size and fit." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:427 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:435 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:410 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:418 msgid "T-shirt:" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:445 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:449 -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:451 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:428 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:432 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:434 msgid "Comments" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:457 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:440 msgid "Donating:" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:469 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:452 msgid "Donate" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:479 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:462 msgid "State/Province/Region" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:483 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:466 msgid "Gift Selected:" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:487 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:470 msgid "No Gift Selected" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:491 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:474 msgid "Sticker Pack" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:499 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:482 msgid "T-Shirt" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:503 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:486 msgid "Choose your size and fit for each shirt." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:507 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:490 msgid "T-Shirt Pack" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:535 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:494 +msgid "Tor: Strength in Numbers" +msgstr "" + +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:498 +msgid "Take back the Internet with Tor" +msgstr "" + +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:522 msgid "Choose your size." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:539 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:526 msgid "Sweatshirt" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:543 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:530 msgid "A required field is missing from the form." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:545 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:532 msgid "Please reload the page and try again." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:549 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:536 msgid "There was a problem submitting your request to the server:<br>" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:553 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:540 msgid "validation failed" msgstr "" #. notes: __field_name__ will be replaced with the field name in the javascript. -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:559 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:546 msgid "__field_name__ must be filled out." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:564 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:551 msgid "This field is required" msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:568 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:555 msgid "Invalid email address." msgstr "" -#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:572 +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:559 msgid "per month" msgstr "" +#: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:563 +msgid "Gift selected" +msgstr "" + #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:59 msgid "Estimated Donation Date:" msgstr "" @@ -1391,7 +1382,7 @@ msgid "Can I donate by mail?" msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:499 -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:605 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:622 msgid "Yes." msgstr "" @@ -1513,110 +1504,141 @@ msgid "Can I donate hardware?" msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:593 -msgid "Typically no, we don't encourage people to donate hardware." +msgid "" +"Typically no, we don't encourage people to donate hardware. But if you want " +"to make a hardware donation that you think might be especially useful for " +"us, please mail giving(at)torproject.org." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:595 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:597 msgid "" -"But if you want to make a hardware donation that you think might be " -"especially useful for us, please mail <span class=\"email" -"\">giving(at)torproject.org</span>." +"The Tor project manages multiple machines in multiple locations, all aimed " +"at helping the Tor project develop software design to protect people's " +"anonymity. It does not, in itself, run the Tor network." msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:601 +msgid "" +"Machines for helping the Tor project develop software are generally paid for " +"by the Tor project or donated by friendly organisations. If you wish to " +"donate hardware resources, it's generally expected the hardware will be " +"fully under the control of the <a href=\"https://help.torproject.org/tsa/" +"\">Tor Sysadmin Team</a>. Details of the requirements are documented in the " +"<a href=\"https://help.torproject.org/tsa/doc/hardware-requirements/\">team " +"wiki</a>." +msgstr "" + +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:605 +msgid "" +"It's possible for the Tor project to run only *services* on top of an " +"already existing operating system as well, but we prefer to run the entire " +"stack ourselves." +msgstr "" + +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:608 +msgid "<a href=\"https://help.torproject.org/tsa/\">Tor Sysadmin Team</a>" +msgstr "" + +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:612 +msgid "" +"<a href=\"https://help.torproject.org/tsa/doc/hardware-requirements/" +"\">Hardware requirements</a>" +msgstr "" + +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:618 msgid "Can I donate my time?" msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:607 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:624 msgid "" "Here's a <a class=\"hyperlinks links\" target=\"_blank\" href=\"https://www." "torproject.org/getinvolved/volunteer.html.en\">list of areas where we would " "love your help</a>." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:613 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:630 msgid "I would like my company to support Tor." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:615 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:632 msgid "What can we do to help?" msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:619 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:636 msgid "" "Your company could match donations made by its employees to the Tor Project--" "that would be wonderful." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:621 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:638 msgid "" "Your company may operate a corporate foundation that gives out grants, and " "if so, you should encourage it to fund us." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:623 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:640 msgid "" "Maybe your company would be willing to <a class=\"hyperlinks links\" target=" "\"_blank\" href=\"https://www.torproject.org/docs/faq.html.en#HowDoIDecide" "\">operate a Tor relay</a>." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:625 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:642 msgid "" "If your company sells cloud services, perhaps it could donate these to Tor: " "We use them in some anti-censorship projects." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:631 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:648 msgid "You don't support my preferred way to donate." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:633 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:650 msgid "Can I recommend a new donation method to you?" msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:637 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:654 msgid "Sure." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:639 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:656 msgid "" "Just mail us at <span class=\"email\">giving(at)torproject.org</span></a>." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:645 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:662 msgid "" "Will the Tor Project accept donations from anybody, or do you reserve the " "right to reject support from specific organizations or individuals?" msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:649 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:666 msgid "We do reserve the right to reject a donation." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:651 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:668 msgid "To date though, we haven't exercised that right." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:653 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:670 msgid "We are happy that a broad range of people use and support Tor." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:659 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:676 msgid "I have more questions." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:661 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:678 msgid "How can I get answers?" msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:665 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:682 msgid "" "Feel free to send questions to <span class=\"email\">frontdesk(at)rt." "torproject.org</span>." msgstr "" -#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:667 +#: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:684 msgid "" "We will try to answer you, and we'll also post your question (and the " "answer) here." @@ -1670,18 +1692,15 @@ msgid "Thank you!" msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:71 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:71 msgid "Thank you for supporting Tor's Strength in Numbers campaign." msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:73 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:73 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:83 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:70 msgid "You should receive an email receipt shortly." msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:75 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:75 msgid "" "With your support and the generous matching funds from Mozilla, we'll be " "able to tackle ambitious projects, such as developing a more secure, privacy-" @@ -1716,59 +1735,59 @@ msgid "" msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:97 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:97 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:82 msgid "SHARE THE TOR PROJECT" msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:166 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:136 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:109 msgid "Got Skills?" msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:172 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:142 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:115 msgid "The Tor network depends on volunteers." msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:178 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:148 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:121 msgid "" "We need people to run relays, write code, organize the community and spread " "the word about our good work." msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:180 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:150 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:123 msgid "Learn how you can help." msgstr "" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:188 -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:158 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:131 msgid "I Want To Volunteer" msgstr "" -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:81 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:68 msgid "Thank you for your support of the Tor Project." msgstr "" -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:85 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:72 msgid "" -"With your support, we'll be able to tackle ambitious projects, such as " -"developing a more secure, privacy-enhancing browser for mobile devices and " -"making it easier for third-party developers to integrate Tor into their " -"applications." +"With your support, we'll be able to tackle ambitious projects, like " +"increasing the capacity and scalability of the Tor network, taking our anti-" +"censorship protections to the next level, and optimizing our development of " +"Tor Browser for Android." msgstr "" -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:91 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:76 msgid "" "It's an incredible time to stand up for world-leading security and privacy " "software." msgstr "" -#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:93 +#: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:78 msgid "" "Tell family, friends, and colleagues that you're supporting privacy and " -"security with Tor!" +"security and taking back the internet with Tor!" msgstr "" #: tmp/cache_locale/05/05c65ace52301a00198c48e1d823da2c14fbd489e7fb45efbca4e79e5709cbdb.php:53 @@ -1781,10 +1800,10 @@ msgstr "" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:83 msgid "" -"Champions of Privacy make a significant pledge of $1,000 or morecreating a " -"steady, reliable source of funds to help us be agile in our defense against " -"the growing threats to privacy, freedom of expression, and access to " -"information online." +"Champions of Privacy make a significant pledge of $1,000 or more—" +"creating a steady, reliable source of funds to help us be agile in our " +"defense against the growing threats to privacy, freedom of expression, and " +"access to information online." msgstr "" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:87

1 0