January 2017 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'dgoulet/ticket19925_030_01'
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit 62c6d5fe168922c139ee75f6f8e4396a5e182426 Merge: ac3b559 8a33abc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 14:33:55 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket19925_030_01' src/or/control.c | 23 +++++++++++++++++++++++ src/or/shared_random.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/or/shared_random.h | 4 ++++ 3 files changed, 73 insertions(+)

1 0

[tor/master] changes file for 19925
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit 8008de81df055f928da0f8d4f93b6b208334554f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 14:36:23 2017 -0500 changes file for 19925 --- changes/ticket19925 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket19925 b/changes/ticket19925 new file mode 100644 index 0000000..a169aa5 --- /dev/null +++ b/changes/ticket19925 @@ -0,0 +1,3 @@ + o Minor features (controller): + - Add GETINFO sr/current and sr/previous keys, to expose shared- + random values to the controller. Closes ticket 19925.

1 0

[tor/master] Merge branch 'bug20569_030_02_squashed'
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit ac3b559e934b02d2fa690ea7dcd2e7e92553dc9e Merge: f31b385 870b5e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 12:52:52 2017 -0500 Merge branch 'bug20569_030_02_squashed' src/common/crypto.h | 6 ++++-- src/or/hs_descriptor.c | 14 ++++++++------ src/or/hs_descriptor.h | 8 +++++++- 3 files changed, 19 insertions(+), 9 deletions(-)

1 0

[tor/master] hs: Use AES-256 for v3 descriptor
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit 870b5e2227c4382aef1d98b1b5fc9d5f4d275c1c Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 7 13:15:46 2016 -0500 hs: Use AES-256 for v3 descriptor That key size is taken from proposal 224 thus specified in the protocol. Closes #20569 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/common/crypto.h | 6 ++++-- src/or/hs_descriptor.c | 14 ++++++++------ src/or/hs_descriptor.h | 8 +++++++- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/common/crypto.h b/src/common/crypto.h index 116e0a6..70f6376 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -59,10 +59,12 @@ #define DIGEST256_LEN 32 /** Length of the output of our 64-bit optimized message digests (SHA512). */ #define DIGEST512_LEN 64 -/** Length of our symmetric cipher's keys. */ +/** Length of our symmetric cipher's keys of 128-bit. */ #define CIPHER_KEY_LEN 16 -/** Length of our symmetric cipher's IV. */ +/** Length of our symmetric cipher's IV of 128-bit. */ #define CIPHER_IV_LEN 16 +/** Length of our symmetric cipher's keys of 256-bit. */ +#define CIPHER256_KEY_LEN 32 /** Length of our public keys. */ #define PK_BYTES (1024/8) /** Length of our DH keys. */ diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 37aa1d7..986f996 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -541,8 +541,9 @@ build_encrypted(const uint8_t *key, const uint8_t *iv, const char *plaintext, tor_assert(plaintext); tor_assert(encrypted_out); - /* This creates a cipher for AES128. It can't fail. */ - cipher = crypto_cipher_new_with_iv((const char *) key, (const char *) iv); + /* This creates a cipher for AES. It can't fail. */ + cipher = crypto_cipher_new_with_iv_and_bits(key, iv, + HS_DESC_ENCRYPTED_BIT_SIZE); /* This can't fail. */ encrypted_len = build_plaintext_padding(plaintext, plaintext_len, &padded_plaintext); @@ -573,7 +574,7 @@ encrypt_descriptor_data(const hs_descriptor_t *desc, const char *plaintext, size_t encrypted_len, final_blob_len, offset = 0; uint8_t *encrypted; uint8_t salt[HS_DESC_ENCRYPTED_SALT_LEN]; - uint8_t secret_key[CIPHER_KEY_LEN], secret_iv[CIPHER_IV_LEN]; + uint8_t secret_key[HS_DESC_ENCRYPTED_KEY_LEN], secret_iv[CIPHER_IV_LEN]; uint8_t mac_key[DIGEST256_LEN], mac[DIGEST256_LEN]; tor_assert(desc); @@ -1058,7 +1059,7 @@ static size_t desc_decrypt_data_v3(const hs_descriptor_t *desc, char **decrypted_out) { uint8_t *decrypted = NULL; - uint8_t secret_key[CIPHER_KEY_LEN], secret_iv[CIPHER_IV_LEN]; + uint8_t secret_key[HS_DESC_ENCRYPTED_KEY_LEN], secret_iv[CIPHER_IV_LEN]; uint8_t mac_key[DIGEST256_LEN], our_mac[DIGEST256_LEN]; const uint8_t *salt, *encrypted, *desc_mac; size_t encrypted_len, result_len = 0; @@ -1118,8 +1119,9 @@ desc_decrypt_data_v3(const hs_descriptor_t *desc, char **decrypted_out) /* Decrypt. Here we are assured that the encrypted length is valid for * decryption. */ crypto_cipher_t *cipher; - cipher = crypto_cipher_new_with_iv((const char *) secret_key, - (const char *) secret_iv); + + cipher = crypto_cipher_new_with_iv_and_bits(secret_key, secret_iv, + HS_DESC_ENCRYPTED_BIT_SIZE); /* Extra byte for the NUL terminated byte. */ decrypted = tor_malloc_zero(encrypted_len + 1); crypto_cipher_decrypt(cipher, (char *) decrypted, diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 083d353..dd4e946 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -40,7 +40,7 @@ /* Length of the KDF output value which is the length of the secret key, * the secret IV and MAC key length which is the length of H() output. */ #define HS_DESC_ENCRYPTED_KDF_OUTPUT_LEN \ - CIPHER_KEY_LEN + CIPHER_IV_LEN + DIGEST256_LEN + CIPHER256_KEY_LEN + CIPHER_IV_LEN + DIGEST256_LEN /* We need to pad the plaintext version of the encrypted data section before * encryption and it has to be a multiple of this value. */ #define HS_DESC_PLAINTEXT_PADDING_MULTIPLE 128 @@ -60,6 +60,12 @@ * view of a descriptor, is 1 that is the version field. */ #define HS_DESC_PLAINTEXT_MIN_FIELDS 1 +/* Key length for the descriptor symmetric encryption. As specified in the + * protocol, we use AES-256 for the encrypted section of the descriptor. The + * following is the length in bytes and the bit size. */ +#define HS_DESC_ENCRYPTED_KEY_LEN CIPHER256_KEY_LEN +#define HS_DESC_ENCRYPTED_BIT_SIZE (HS_DESC_ENCRYPTED_KEY_LEN * 8) + /* Type of authentication in the descriptor. */ typedef enum { HS_DESC_AUTH_PASSWORD = 1,

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 11 Jan '17

11 Jan '17

commit 6b89c55f5e15d3448aa1dd54cfec0cdcaa4910a6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 16:18:17 2017 +0000 Update translations for tor-browser-manual --- sv/sv.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sv/sv.po b/sv/sv.po index 21d2bf3..2501bf9 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -355,6 +355,9 @@ msgid "" "simply write “windows”, “osx”, or “linux”, (without quotation marks) " "depending on your operating system." msgstr "" +"Skicka ett e-post till gettor(a)torproject.org med något av följande i " +"meddelandetexten \"winows\", \"osx\" eller \"linux\" (ta inte med " +"citattecken) beroende på ditt val av operativsystem." #: downloading.page:46 msgid ""

1 0

[webwml/staging] Merge branch 'master' into staging
by hiro＠torproject.org 11 Jan '17

11 Jan '17

commit c8155f8ebc2252b874270634ed7ecdc99aa9f8d3 Merge: 667157a 5b7d63d Author: hiromipaw <hiro(a)torproject.org> Date: Wed Jan 11 17:17:19 2017 +0100 Merge branch 'master' into staging about/en/corepeople.wml | 3 +++ 1 file changed, 3 insertions(+)

1 0

[webwml/staging] Add Linda Lee to people
by hiro＠torproject.org 11 Jan '17

11 Jan '17

commit 5b7d63d707bb10c49fe0e376310f5e84b08957a8 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Jan 11 17:11:34 2017 +0100 Add Linda Lee to people --- about/en/corepeople.wml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 6007c73..7219796 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -184,6 +184,9 @@ <dt>Jens Kubieziel, Sysadmin</dt> <dd>Helps keep our core infrastructure going.</dd> + <dt>Linda Lee, UX team lead</dt> + <dd></dd> + <dt>Pepijn Le Heux, Advocate</dt> <dd>Tireless advocate and Tor enthusiast in the Netherlands.</dd>

1 0

[webwml/master] Add Linda Lee to people
by hiro＠torproject.org 11 Jan '17

11 Jan '17

commit 5b7d63d707bb10c49fe0e376310f5e84b08957a8 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Jan 11 17:11:34 2017 +0100 Add Linda Lee to people --- about/en/corepeople.wml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 6007c73..7219796 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -184,6 +184,9 @@ <dt>Jens Kubieziel, Sysadmin</dt> <dd>Helps keep our core infrastructure going.</dd> + <dt>Linda Lee, UX team lead</dt> + <dd></dd> + <dt>Pepijn Le Heux, Advocate</dt> <dd>Tireless advocate and Tor enthusiast in the Netherlands.</dd>

1 0

[webwml/master] Add changes to core people and contributors pages
by hiro＠torproject.org 11 Jan '17

11 Jan '17

commit 8d8c1ebb893fa5d111cdee0158898fdb20e793ff Author: hiromipaw <hiro(a)torproject.org> Date: Wed Jan 11 15:59:31 2017 +0100 Add changes to core people and contributors pages --- about/en/contributors.wml | 37 +++++++++++++++++++++++++++++++-- about/en/corepeople.wml | 52 ++++++++++++++++++++--------------------------- 2 files changed, 57 insertions(+), 32 deletions(-) diff --git a/about/en/contributors.wml b/about/en/contributors.wml index 563d3de..5db6a59 100644 --- a/about/en/contributors.wml +++ b/about/en/contributors.wml @@ -41,6 +41,7 @@ part of Google Summer of Code 2008.</dd> <dt>Benedikt Boss</dt><dd>Worked during the 2007 Google Summer of Code on <a href="https://svn.torproject.org/svn/topf/trunk/README">TOPF</a>, a fuzzer for Tor; mentored by Roger.</dd> + <dt>Caspar Bowden, Director (1961 - 2015)</dt> <dd>Caspar was an advocate for Tor in Europe and a specialist in data protection policy, EU and US surveillance law, PET research, identity @@ -50,16 +51,26 @@ country deserved the right to privacy irrespective of national borders. He predicted US mass surveillance programs such as PRISM and was vindicated after the Snowden revelations. We miss him deeply.</dd> + +<dt>John Brooks, Ricochet Developer</dt> +<dd>Leads <a href="https://ricochet.im/">Ricochet</a>, a +decentralized chat system where every user is an onion service. +Also a core contributor to Tor onion service development.</dd> + <dt>Ren Bucholz</dt><dd>Our fine logo and images.</dd> + <dt>Fallon Chen</dt><dd> Worked on Improving Tor Path Selection (<a href="https://svn.torproject.org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/">svn</a>) and <a href="<specblob>proposals/151-path-selection-improvements.txt">proposal 151</a> as part of Google Summer of Code 2008.</dd> + <dt>Bram Cohen</dt><dd>Helped design our congestion control mechanisms, in Tor's early days.</dd> + <dt>Pat Double</dt><dd>Creator of the Incognito LiveCD.</dd> + <dt>Christopher Davis, Libevent hacker</dt> <dd>Worked during Google Summer of Code 2009 on porting Polipo to Windows. He currently helps with the libevent @@ -95,6 +106,10 @@ href="https://svn.torproject.org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/"> Summer of Code 2011, and developed <a href="https://compass.torproject.org/">Compass</a>.</dd> +<dt>Marie Gutbub, Advocate</dt> +<dd>Helps educate the world about the value of Tor, especially +in Europe.</dd> + <dt>Harmony, Support, Advocate</dt> <dd>Wrote for <a href="<wiki>TorWeeklyNews/">Tor Weekly News</a>, the help desk, and the browser manual.</dd> @@ -120,12 +135,18 @@ on making Tor relays stable on Windows, by developing a <a href="https://svn.torproject.org/svn/libevent-urz/trunk/README">buffer implementation for libevent</a>; mentored by Nick.</dd> + <dt>Joe Kowalski</dt><dd>Original author and provider of the torstatus script formerly run on nighteffect.</dd> + <dt>Adam Langley</dt><dd>Our fine eventdns code.</dd> <dt>Rebecca MacKinnon</dt><dd>Former Director of Tor. Co-Founder of <a href="http://www.globalvoicesonline.org/">Global Voices Online</a>.</dd> +<dt>Tom Leckrone</dt> +<dd>Helps make sure everything runs smoothly. Coordinates +logistics and people and everything in between.</dd> + <dt>Bruce Leidl</dt> <dd>Lead developer of <a href="http://www.subgraph.com/orchid.html">Orchid</a>, @@ -136,19 +157,28 @@ a Tor client in Java.</dd> roles of finance, advocacy, project management, strategy, press, law enforcement liaison, and domestic violence advocacy.</dd> +<dt>Kelley Misata, Advocate</dt> +<dd>Teaches many people about the value of privacy, +especially in the contexts of domestic violence and cyber +stalking.</dd> + <dt>Matt Pagan</dt> <dd>Maintained the FAQ and other documentation, and helped answer all the users who contact the support desk.</dd> <dt>Chris Palmer</dt><dd>Our liaison and tech guy with EFF while EFF was funding us. Also helped advocate and write end-user docs.</dd> + <dt>Martin Peck</dt><dd>Worked on a VM-based transparent proxying approach for Tor clients on Windows.</dd> + <dt>Matej Pfajfar</dt><dd>Author of the original onion routing code that Tor is based on, so we didn't have to start from scratch.</dd> + <dt>Robert Ransom</dt><dd>Found and fixed a bunch of Tor bugs, mostly in Tor's hidden service code, and added several security and usability features to Tor and Tor Browser Bundle.</dd> + <dt>Johannes Renner</dt><dd> Worked during the 2007 Google Summer of Code on modifying <a href="https://svn.torproject.org/svn/torflow/trunk/README">TorFlow</a> @@ -164,6 +194,9 @@ projects such as Vidalia, Torbutton and the website.</dd> href="https://globe.torproject.org/">Globe</a>, which is on its way to replacing Atlas and eventually Compass.</dd> +<dt>Andrea Shepard, Developer</dt> +<dd>Works with Nick as a core Tor developer.</dd> + <dt>Scott Squires</dt><dd>The original developer of <a href="<page docs/torbutton/index>">Torbutton</a>.</dd> @@ -204,7 +237,7 @@ href="https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-perf/"> </div>  - + <div id = "sidecol"> #include "side.wmi" #include "info.wmi" @@ -212,4 +245,4 @@ href="https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-perf/">  </div>  -#include <foot.wmi> +#include <foot.wmi> diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 7df9e2a..6007c73 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -16,7 +16,7 @@ <h1>Core Tor People</h1> <dl> - <dt>Sue Abt, Accountant and Finance</dt> + <dt>Sue Abt, Accounting Manager</dt> <dd>Sue runs Tor's finances and audit compliance.</dd> <dt>Micah Anderson</dt> @@ -55,12 +55,9 @@ href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a>, and on Snowflake.</dd> - <dt>John Brooks, Ricochet Developer</dt> - <dd>Leads <a href="https://ricochet.im/">Ricochet</a>, a - decentralized chat system where every user is an onion service. - Also a core contributor to Tor onion service development.</dd> + <dt>Cass Brewer, Writer</dt><dd></dd> - <dt>Colin Childs, Translation Coordinator and Support</dt> + <dt>Colin Childs, Support and Translation Coordinator</dt> <dd>Helps wrangle <a href="https://www.transifex.com/projects/p/torproject/">Transifex</a> for us, and also helps answer all the users who contact the @@ -71,7 +68,7 @@ has a day job at First Look Media, and remains active in the general privacy space.</dd> - <dt>Roger Dingledine, Project Leader, Director, Research Director</dt> + <dt>Roger Dingledine, Research Director and President</dt> <dd>Original developer of Tor along with Nick Mathewson and Paul Syverson. Leading researcher in the anonymous communications field. Frequent speaker at conferences to advocate Tor and @@ -119,7 +116,7 @@ <dt>Aaron Gibson, Developer</dt> <dd>Used to develop OONI, and now works on Torflow.</dd> - <dt>Dr. Ian Goldberg, Director, Researcher</dt> + <dt>Dr. Ian Goldberg, Researcher</dt> <dd>Cryptographer, privacy expert, and professor; one of the designers of <a href="https://otr.cypherpunks.ca/">Off-the-Record @@ -134,10 +131,6 @@ href="https://trac.torproject.org/projects/tor/wiki/org/meetings">Tor Dev Meetings</a>, and advises on Tor community matters.</dd> - <dt>Marie Gutbub, Advocate</dt> - <dd>Helps educate the world about the value of Tor, especially - in Europe.</dd> - <dt>Sebastian Hahn, Developer</dt> <dd>Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one @@ -194,10 +187,6 @@ <dt>Pepijn Le Heux, Advocate</dt> <dd>Tireless advocate and Tor enthusiast in the Netherlands.</dd> - <dt>Tom Leckrone</dt> - <dd>Helps make sure everything runs smoothly. Coordinates - logistics and people and everything in between.</dd> - <dt>Andreas Lehner, Advocate</dt> <dd>Operates a directory authority in Germany with the CCC, and does talks and discussions in support of privacy around @@ -209,7 +198,7 @@ a service that provides alternative methods to download Tor Browser.</dd> - <dt>Dr. Karsten Loesing, Metrics Researcher and Developer</dt> + <dt>Dr. Karsten Loesing, Lead Metrics Researcher and Developer</dt> <dd>Primary researcher and developer into <a href="https://metrics.torproject.org/">anonymous metrics</a> which started as a National Science Foundation grant.</dd> @@ -230,7 +219,7 @@ and also helps strengthen the network with exit relays at libraries.</dd> - <dt>Nick Mathewson, Chief Architect, Vice President, Researcher, Director</dt> + <dt>Nick Mathewson, Chief Architect and Vice President</dt> <dd>One of the three original designers of Tor—does a lot of the ongoing design work, and coordinates and leads ongoing development.</dd> @@ -243,12 +232,7 @@ <dt>Ondrej Mikle</dt> <dd>Maintains our RPM packages.</dd> - <dt>Kelley Misata, Advocate</dt> - <dd>Teaches many people about the value of privacy, - especially in the contexts of domestic violence and cyber - stalking.</dd> - - <dt>Julius Mittenzwei, Director</dt> + <dt>Julius Mittenzwei</dt> <dd>Germany-based lawyer and Internet activist.</dd> <dt>Dr. Steven Murdoch, Researcher and Developer</dt> @@ -273,6 +257,9 @@ <dd>Manages the Debian packages, runs one of the directory authorities, and generally helps out a lot.</dd> + <dt>Brad Parker, Chief Financial and Grants Officer</dt> + <dd></dd> + <dt>Mike Perry, Tor Browser and Tor Performance Developer</dt> <dd>Lead developer on Tor Browser, developer of <a href="<page docs/torbutton/index>">Torbutton</a>, author of <a @@ -288,6 +275,10 @@ which is shaping up to be the Tor Browser equivalent for Android.</dd> + <dt>Silvia Puglisi, Services Hacker</dt> + <dd>Services admin, metrics team contributor, and generally helping + picking up tasks around.</dd> + <dt>Sina Rabbani, Advocate</dt> <dd>Does trainings and outreach. Runs one of the directory authorities.</dd> @@ -301,13 +292,14 @@ <dd>Works on security analysis, designer of "bananaphone" transport, and part of the pluggable transports team.</dd> - <dt>Wendy Seltzer, Director</dt> + <dt>Jon Selon, Administrative Manager</dt> + <dd>General administrative tasks, event coordination, donor management, + swag management.</dd> + + <dt>Wendy Seltzer</dt> <dd>Lawyer, cyberlaw professor, and founder of <a href="http://chillingeffects.org/">ChillingEffects.org</a>.</dd> - <dt>Andrea Shepard, Developer</dt> - <dd>Works with Nick as a core Tor developer.</dd> - <dt>Sukhbir Singh, Developer</dt> <dd>Develops and maintains TorBirdy (Torbutton for Thunderbird). Rewrote and maintains Gettor. Working on <a @@ -344,7 +336,7 @@ <dd>Spanish translator; helps answer all the users who contact the support desk.</dd> - <dt>Rabbi Rob Thomas, Director</dt> + <dt>Rabbi Rob Thomas</dt> <dd>Shares his experience with smoothly running non-profits, and also serves as our Internet governance bureaucracy guru.</dd> @@ -371,7 +363,7 @@ <dt>Erin Wyatt, HR Manager</dt> <dd>Employee benefits, policy questions, and baked goods.</dd> - <dt>Yawning, Developer</dt> + <dt>Yawning Angel, Developer</dt> <dd>Lead developer on obfs4proxy and other pluggable transports. Part of the pluggable transports team.</dd>

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 11 Jan '17

11 Jan '17

commit bd0556e343609aa29ca74285c9db2f7d4fa3ca71 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 15:48:17 2017 +0000 Update translations for tor-browser-manual --- sv/sv.po | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 9a4f79a..21d2bf3 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -5,6 +5,7 @@ # Jonatan Nyberg <jonatan(a)autistici.org>, 2016 # Daniel Sjöberg <sjbrg(a)protonmail.com>, 2016 # Peter Michanek <peter(a)michanek.se>, 2016 +# Yoga Andersson <yoga.andersson(a)gmail.com>, 2016 # Nikolai Stenfors <nikolai.stenfors(a)bahnhof.se>, 2016 msgid "" msgstr "" @@ -119,7 +120,7 @@ msgstr "" #: bridges.page:6 msgid "Learn what bridges are and how to get them" -msgstr "" +msgstr "Lär dig vad bryggor är och hur man får tillgång till dem" #: bridges.page:10 msgid "Bridges" @@ -151,6 +152,8 @@ msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have two options:" msgstr "" +"Eftersom bryggadresser inte är offentliga, måste du begära dem själv. Du har" +" två alternativ:" #: bridges.page:36 msgid "" @@ -158,6 +161,9 @@ msgid "" "href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" " and follow the instructions, or" msgstr "" +"Besök <link " +"href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" +" och följ instruktionerna, eller" #: bridges.page:42 msgid "" @@ -211,7 +217,7 @@ msgstr "Vad göra om Tor nätverk är blockerat" #: circumvention.page:10 msgid "Circumvention" -msgstr "Kringå" +msgstr "Kringgående" #: circumvention.page:12 msgid ""

1 0