[tor-commits] [torbutton/master] Bug 28187: Change tor circuit icon to torbutton.svg

2018-11-07 Thread gk
commit 6a9a4f528d8b8254402802a7a86cd722b747a5a6
Author: Arthur Edelstein 
Date:   Fri Nov 2 10:03:35 2018 -0700

Bug 28187: Change tor circuit icon to torbutton.svg

Also, introduce a "new circuit" icon (designed by
Antonela Debiasi) to hamburger menu.
---
 src/chrome/content/menu-items-overlay.xul |  2 ++
 src/chrome/skin/new_circuit.svg   |  8 
 src/chrome/skin/relay.svg | 10 --
 src/chrome/skin/tor-circuit-display.css   |  6 +++---
 src/chrome/skin/torbutton.css |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/chrome/content/menu-items-overlay.xul 
b/src/chrome/content/menu-items-overlay.xul
index 274c9c71..b2e862b3 100644
--- a/src/chrome/content/menu-items-overlay.xul
+++ b/src/chrome/content/menu-items-overlay.xul
@@ -15,10 +15,12 @@
 label="_menu.new_circuit;"
 oncommand="torbutton_new_circuit();"/>
   
   
diff --git a/src/chrome/skin/new_circuit.svg b/src/chrome/skin/new_circuit.svg
new file mode 100644
index ..e0a93cc8
--- /dev/null
+++ b/src/chrome/skin/new_circuit.svg
@@ -0,0 +1,8 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+Icon / New Circuit@1.5x
+
+
+
+
+
diff --git a/src/chrome/skin/relay.svg b/src/chrome/skin/relay.svg
deleted file mode 100644
index b2f5f16c..
--- a/src/chrome/skin/relay.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
-relay
-Created with Sketch.
-
-
-
-
-
\ No newline at end of file
diff --git a/src/chrome/skin/tor-circuit-display.css 
b/src/chrome/skin/tor-circuit-display.css
index ed17f91d..576590a4 100644
--- a/src/chrome/skin/tor-circuit-display.css
+++ b/src/chrome/skin/tor-circuit-display.css
@@ -8,12 +8,12 @@ and lines drawn between them to represent Tor network 
inter-relay connections.
 
 
 #circuit-display-content {
-  background-image: url(chrome://torbutton/skin/relay.svg);
+  background-image: url(chrome://torbutton/skin/torbutton.svg);
   background-position: 1em 1em;
   background-repeat: no-repeat;
   background-size: 24px auto;
-  background-color: rgba(255,255,255,0.4);
-  background-blend-mode: lighten;
+  background-color: rgba(255,255,255,0.15);
+  background-blend-mode: overlay;
   cursor: default;
   padding: 0.5em 0px 0.5em;
   padding-inline-end: 1em;
diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css
index 928ba93d..28333874 100644
--- a/src/chrome/skin/torbutton.css
+++ b/src/chrome/skin/torbutton.css
@@ -80,5 +80,5 @@ svg#tor-circuit circle.node-circle {
 }
 
 #appMenuNewCircuit {
-list-style-image: url("chrome://torbutton/skin/relay.svg");
+list-style-image: url("chrome://torbutton/skin/new_circuit.svg");
 }

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2018-11-07 Thread translation
commit a80303b792ca409dd4d119932866b3cf4531fb8f
Author: Translation commit bot 
Date:   Thu Nov 8 00:46:46 2018 +

Update translations for tails-greeter-2
---
 es/es.po | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/es/es.po b/es/es.po
index 234a30392..7e63d298b 100644
--- a/es/es.po
+++ b/es/es.po
@@ -3,14 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# strel, 2017
+# Emma Peel, 2017
+# eulalio barbero espinosa , 2017
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-04 09:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Emma Peel, 2016\n"
+"PO-Revision-Date: 2016-11-18 21:29+\n"
+"Last-Translator: eulalio barbero espinosa , 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed

2018-11-07 Thread translation
commit 053ddc6106f4bf10f966eba01ad72228176b0c92
Author: Translation commit bot 
Date:   Thu Nov 8 00:46:53 2018 +

Update translations for tails-greeter-2_completed
---
 es/es.po | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/es/es.po b/es/es.po
index 234a30392..7e63d298b 100644
--- a/es/es.po
+++ b/es/es.po
@@ -3,14 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# strel, 2017
+# Emma Peel, 2017
+# eulalio barbero espinosa , 2017
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-04 09:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Emma Peel, 2016\n"
+"PO-Revision-Date: 2016-11-18 21:29+\n"
+"Last-Translator: eulalio barbero espinosa , 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [metrics-web/master] Move "We're hiring" link from navbar to start page.

2018-11-07 Thread karsten
commit debe0cfb3ee8fe6fdb8c234479adc729fe42dcb3
Author: Karsten Loesing 
Date:   Wed Nov 7 23:45:00 2018 +0100

Move "We're hiring" link from navbar to start page.

Suggested by antonela on #28349.
---
 src/main/resources/web/jsps/index.jsp | 5 +
 src/main/resources/web/jsps/top.jsp   | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/web/jsps/index.jsp 
b/src/main/resources/web/jsps/index.jsp
index 3fa49b8..fbccd7d 100644
--- a/src/main/resources/web/jsps/index.jsp
+++ b/src/main/resources/web/jsps/index.jsp
@@ -6,6 +6,11 @@
 
 
   
+
+  
+We're hiring  The Tor Project is seeking an 
experienced Data Architect to take our metrics work to the next level. https://www.torproject.org/about/jobs-metrics-data-architect.html.en; 
target="_blank">Read the job posting.
+  
+
   
 Welcome to Tor Metrics!
 
diff --git a/src/main/resources/web/jsps/top.jsp 
b/src/main/resources/web/jsps/top.jsp
index 96b3480..440b2ee 100644
--- a/src/main/resources/web/jsps/top.jsp
+++ b/src/main/resources/web/jsps/top.jsp
@@ -89,7 +89,6 @@ document.write('
 More
-https://www.torproject.org/about/jobs-metrics-data-architect.html.en;> We Are 
Hiring!
  
class="active"> News
  
class="active"> Sources
  
class="active"> Services

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Make the hibernate.c changes for systemd compile.

2018-11-07 Thread nickm
commit 212bd9778b5c249f02f8fbdc1e8ccbe4c108f03a
Author: Nick Mathewson 
Date:   Wed Nov 7 16:27:20 2018 -0500

Make the hibernate.c changes for systemd compile.
---
 src/feature/hibernate/hibernate.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/src/feature/hibernate/hibernate.c 
b/src/feature/hibernate/hibernate.c
index 4c46c4fe2..6f8795cec 100644
--- a/src/feature/hibernate/hibernate.c
+++ b/src/feature/hibernate/hibernate.c
@@ -50,6 +50,16 @@ hibernating, phase 2:
 #include 
 #endif
 
+#ifdef HAVE_SYSTEMD
+#  if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__)
+/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse
+ * Coverity. Here's a kludge to unconfuse it.
+ */
+#   define __INCLUDE_LEVEL__ 2
+# endif /* defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) */
+#include 
+#endif /* defined(HAVE_SYSTEMD) */
+
 /** Are we currently awake, asleep, running out of bandwidth, or shutting
  * down? */
 static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL;
@@ -821,6 +831,8 @@ hibernate_soft_limit_reached(void)
   return get_accounting_bytes() >= soft_limit;
 }
 
+#define TOR_USEC_PER_SEC (100)
+
 /** Called when we get a SIGINT, or when bandwidth soft limit is
  * reached. Puts us into "loose hibernation": we don't accept new
  * connections, but we continue handling old ones. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] Make the hibernate.c changes for systemd compile.

2018-11-07 Thread nickm
commit 212bd9778b5c249f02f8fbdc1e8ccbe4c108f03a
Author: Nick Mathewson 
Date:   Wed Nov 7 16:27:20 2018 -0500

Make the hibernate.c changes for systemd compile.
---
 src/feature/hibernate/hibernate.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/src/feature/hibernate/hibernate.c 
b/src/feature/hibernate/hibernate.c
index 4c46c4fe2..6f8795cec 100644
--- a/src/feature/hibernate/hibernate.c
+++ b/src/feature/hibernate/hibernate.c
@@ -50,6 +50,16 @@ hibernating, phase 2:
 #include 
 #endif
 
+#ifdef HAVE_SYSTEMD
+#  if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__)
+/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse
+ * Coverity. Here's a kludge to unconfuse it.
+ */
+#   define __INCLUDE_LEVEL__ 2
+# endif /* defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) */
+#include 
+#endif /* defined(HAVE_SYSTEMD) */
+
 /** Are we currently awake, asleep, running out of bandwidth, or shutting
  * down? */
 static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL;
@@ -821,6 +831,8 @@ hibernate_soft_limit_reached(void)
   return get_accounting_bytes() >= soft_limit;
 }
 
+#define TOR_USEC_PER_SEC (100)
+
 /** Called when we get a SIGINT, or when bandwidth soft limit is
  * reached. Puts us into "loose hibernation": we don't accept new
  * connections, but we continue handling old ones. */

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-11-07 Thread nickm
commit 8e3bae566aaa91d65cfcefef10ea8a4e3aeeb280
Merge: 2fb27d61e 212bd9778
Author: Nick Mathewson 
Date:   Wed Nov 7 16:27:26 2018 -0500

Merge branch 'maint-0.3.5'

 src/feature/hibernate/hibernate.c | 12 
 1 file changed, 12 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Make the hibernate.c changes for systemd compile.

2018-11-07 Thread nickm
commit 212bd9778b5c249f02f8fbdc1e8ccbe4c108f03a
Author: Nick Mathewson 
Date:   Wed Nov 7 16:27:20 2018 -0500

Make the hibernate.c changes for systemd compile.
---
 src/feature/hibernate/hibernate.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/src/feature/hibernate/hibernate.c 
b/src/feature/hibernate/hibernate.c
index 4c46c4fe2..6f8795cec 100644
--- a/src/feature/hibernate/hibernate.c
+++ b/src/feature/hibernate/hibernate.c
@@ -50,6 +50,16 @@ hibernating, phase 2:
 #include 
 #endif
 
+#ifdef HAVE_SYSTEMD
+#  if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__)
+/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse
+ * Coverity. Here's a kludge to unconfuse it.
+ */
+#   define __INCLUDE_LEVEL__ 2
+# endif /* defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) */
+#include 
+#endif /* defined(HAVE_SYSTEMD) */
+
 /** Are we currently awake, asleep, running out of bandwidth, or shutting
  * down? */
 static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL;
@@ -821,6 +831,8 @@ hibernate_soft_limit_reached(void)
   return get_accounting_bytes() >= soft_limit;
 }
 
+#define TOR_USEC_PER_SEC (100)
+
 /** Called when we get a SIGINT, or when bandwidth soft limit is
  * reached. Puts us into "loose hibernation": we don't accept new
  * connections, but we continue handling old ones. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2018-11-07 Thread nickm
commit d4724f1414d23cda7ae9a27f45cef9faf7e89544
Merge: 016246366 212bd9778
Author: Nick Mathewson 
Date:   Wed Nov 7 16:27:26 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 src/feature/hibernate/hibernate.c | 12 
 1 file changed, 12 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] More changelog edits

2018-11-07 Thread nickm
commit a073ebf1913f1dce9eb5149f9126f337d6f80ab4
Author: Nick Mathewson 
Date:   Wed Nov 7 15:11:17 2018 -0500

More changelog edits
---
 ChangeLog | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2df827762..284414f36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,14 @@
 Changes in version 0.3.5.4-alpha - 2018-11-07
-  Tor 0.3.5.4-alpha includes numerous bugfixes, and continues our
-  attempts to stabilize this alpha branch and build it into a foundation
-  for an acceptable long-term-support release.
+  Tor 0.3.5.4-alpha includes numerous bugfixes on earlier versions, and
+  improves our continuous integration support. It continues our attempts
+  to stabilize this alpha branch and build it into a foundation for an
+  acceptable long-term-support release.
 
   o Major bugfixes (compilation, rust):
 - Rust tests can now build and run successfully with the
   --enable-fragile-hardening option enabled. Doing this currently
   requires the rust beta channel; it will be possible with stable
-  rust as of rust version 1.31 is out. Patch from Alex Crichton.
+  rust once Rust version 1.31 is released. Patch from Alex Crichton.
   Fixes bugs 27272, 27273, and 27274. Bugfix on 0.3.1.1-alpha.
 
   o Major bugfixes (embedding, main loop):
@@ -19,7 +20,7 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
   o Minor features (continuous integration):
 - Add a Travis CI build for --enable-nss on Linux gcc. Closes
   ticket 27751.
-- Add new CI job to Travis configuration to runs stem-based
+- Add new CI job to Travis configuration to run stem-based
   integration tests. Closes ticket 27913.
 
   o Minor features (Windows, continuous integration):
@@ -36,8 +37,8 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
   on 0.3.5.1-alpha. Patch from Kris Katterjohn.
 
   o Minor bugfixes (compilation, OpenSolaris):
-- Add a missing include to compat_pthreads.c, to fix compilation on
-  OpenSolaris and its descendants. Fixes bug 27963; bugfix
+- Fix compilation on OpenSolaris and its descendants by adding a
+  missing include to compat_pthreads.c. Fixes bug 27963; bugfix
   on 0.3.5.1-alpha.
 
   o Minor bugfixes (configuration):
@@ -47,8 +48,8 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
 
   o Minor bugfixes (directory authority, also in 0.3.4.9):
 - Log additional info when we get a relay that shares an ed25519 ID
-  with a different relay, instead making a BUG() warning. Fixes bug
-  27800; bugfix on 0.3.2.1-alpha.
+  with a different relay, instead of a BUG() warning with a
+  backtrace. Fixes bug 27800; bugfix on 0.3.2.1-alpha.
 
   o Minor bugfixes (onion service v3):
 - Build the service descriptor's signing key certificate before
@@ -80,8 +81,8 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
 
   o Minor bugfixes (relay shutdown, systemd):
 - Notify systemd of ShutdownWaitLength so it can be set to longer
-  than systemd's TimeoutStopSec. In tor's systemd service file, set
-  TimeoutSec to 60 seconds, to allow tor some time to shut down.
+  than systemd's TimeoutStopSec. In Tor's systemd service file, set
+  TimeoutSec to 60 seconds, to allow Tor some time to shut down.
   Fixes bug 28113; bugfix on 0.2.6.2-alpha.
 
   o Minor bugfixes (rust, also in 0.3.4.9):

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] One more comma weasel didn't like

2018-11-07 Thread nickm
commit 0162463667edd85b0973a6cc182b66288585be92
Author: Nick Mathewson 
Date:   Wed Nov 7 15:19:53 2018 -0500

One more comma weasel didn't like
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ea587cc08..b752aa36a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 Changes in version 0.3.5.4-alpha - 2018-11-07
-  Tor 0.3.5.4-alpha includes numerous bugfixes on earlier versions, and
+  Tor 0.3.5.4-alpha includes numerous bugfixes on earlier versions and
   improves our continuous integration support. It continues our attempts
   to stabilize this alpha branch and build it into a foundation for an
   acceptable long-term-support release.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] And yet more edits

2018-11-07 Thread nickm
commit 082825a0a458d3098202b59989792325acba0b6f
Author: Nick Mathewson 
Date:   Wed Nov 7 15:18:46 2018 -0500

And yet more edits
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 284414f36..ea587cc08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,7 +67,7 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
   onion service version and then look for invalid options.
   Previously, we did the reverse, but that broke existing configs
   which were pointed to a v2 service and had options like
-  HiddenServiceAuthorizeClient set Fixes bug 28127; bugfix on
+  HiddenServiceAuthorizeClient set. Fixes bug 28127; bugfix on
   0.3.5.1-alpha. Patch by Neel Chauhan.
 
   o Minor bugfixes (portability):
@@ -82,7 +82,7 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
   o Minor bugfixes (relay shutdown, systemd):
 - Notify systemd of ShutdownWaitLength so it can be set to longer
   than systemd's TimeoutStopSec. In Tor's systemd service file, set
-  TimeoutSec to 60 seconds, to allow Tor some time to shut down.
+  TimeoutSec to 60 seconds to allow Tor some time to shut down.
   Fixes bug 28113; bugfix on 0.2.6.2-alpha.
 
   o Minor bugfixes (rust, also in 0.3.4.9):

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Minor edits to changelog

2018-11-07 Thread nickm
commit 4bacc38cc41e884c304ea5a7f20af2cc4947e7d7
Author: Nick Mathewson 
Date:   Wed Nov 7 14:54:58 2018 -0500

Minor edits to changelog
---
 ChangeLog | 35 +--
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cbdb9634..2df827762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
   o Minor features (continuous integration):
 - Add a Travis CI build for --enable-nss on Linux gcc. Closes
   ticket 27751.
+- Add new CI job to Travis configuration to runs stem-based
+  integration tests. Closes ticket 27913.
 
   o Minor features (Windows, continuous integration):
 - Build tor on Windows Server 2012 R2 and Windows Server 2016 using
@@ -33,36 +35,37 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
 - Fix a pair of missing headers on OpenBSD. Fixes bug 28303; bugfix
   on 0.3.5.1-alpha. Patch from Kris Katterjohn.
 
-  o Minor bugfixes (compilation, opensolaris):
+  o Minor bugfixes (compilation, OpenSolaris):
 - Add a missing include to compat_pthreads.c, to fix compilation on
   OpenSolaris and its descendants. Fixes bug 27963; bugfix
   on 0.3.5.1-alpha.
 
   o Minor bugfixes (configuration):
-- Resume refusing to start with relative file paths and RunAsDaemon
-  set (regression from the fix for bug 22731). Fixes bug 28298;
-  bugfix on 0.3.3.1-alpha.
+- Refuse to start with relative file paths and RunAsDaemon set
+  (regression from the fix for bug 22731). Fixes bug 28298; bugfix
+  on 0.3.3.1-alpha.
 
   o Minor bugfixes (directory authority, also in 0.3.4.9):
 - Log additional info when we get a relay that shares an ed25519 ID
   with a different relay, instead making a BUG() warning. Fixes bug
   27800; bugfix on 0.3.2.1-alpha.
 
-  o Minor bugfixes (hidden service v3):
-- Build the service descriptor signing key certificate before
-  uploading so we always have a fresh one leaving no chances for it
-  to expire service side. Fixes bug 27838; bugfix on 0.3.2.1-alpha.
+  o Minor bugfixes (onion service v3):
+- Build the service descriptor's signing key certificate before
+  uploading, so we always have a fresh one: leaving no chances for
+  it to expire service side. Fixes bug 27838; bugfix
+  on 0.3.2.1-alpha.
 
-  o Minor bugfixes (hidden service v3, client authorization):
+  o Minor bugfixes (onion service v3, client authorization):
 - Fix an assert() when adding a client authorization for the first
   time and then sending a HUP signal to the service. Before that,
-  tor would stop abruptly. Fixes bug 27995; bugfix on 0.3.5.1-alpha.
+  Tor would stop abruptly. Fixes bug 27995; bugfix on 0.3.5.1-alpha.
 
   o Minor bugfixes (onion services):
 - Unless we have explicitly set HiddenServiceVersion, detect the
   onion service version and then look for invalid options.
   Previously, we did the reverse, but that broke existing configs
-  which were pointed to a v2 hidden service and had options like
+  which were pointed to a v2 service and had options like
   HiddenServiceAuthorizeClient set Fixes bug 28127; bugfix on
   0.3.5.1-alpha. Patch by Neel Chauhan.
 
@@ -72,7 +75,7 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
   on 0.3.5.1-alpha.
 
   o Minor bugfixes (protover, rust):
-- Reject extra commas in version string. Fixes bug 27197; bugfix
+- Reject extra commas in version strings. Fixes bug 27197; bugfix
   on 0.3.3.3-alpha.
 
   o Minor bugfixes (relay shutdown, systemd):
@@ -104,13 +107,9 @@ Changes in version 0.3.5.4-alpha - 2018-11-07
   (FreeBSD failures have been treated as expected since 18204 in
   0.2.8.) Fixes bug 27948; bugfix on 0.2.5.2-alpha.
 
-  o Testing:
-- Add new CI job to Travis configuration that runs stem-based
-  integration tests. Closes ticket 27913.
-
-  o Documentation (hidden service manpage):
+  o Documentation (onion service manpage):
 - Improve HSv3 client authorization by making some options more
-  explicit and detailed. Closes ticket 28026. Patch by "mtigas".
+  explicit and detailed. Closes ticket 28026. Patch by Mike Tigas.
 
 
 Changes in version 0.3.4.9 - 2018-11-02

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Bump to 0.3.5.4-alpha

2018-11-07 Thread nickm
commit f229c4e66ae7f92fd02e93f2766ae37c07152ec5
Author: Nick Mathewson 
Date:   Wed Nov 7 14:40:26 2018 -0500

Bump to 0.3.5.4-alpha
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index d0de6356d..1fc49fe90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.3-alpha-dev])
+AC_INIT([tor],[0.3.5.4-alpha])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 5c37dd7ce..088c3e4a6 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.3-alpha-dev"
+!define VERSION "0.3.5.4-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 4c89925d3..9eacbc31f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.3-alpha-dev"
+#define VERSION "0.3.5.4-alpha"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-11-07 Thread nickm
commit 2fb27d61e7f58d2f572733c5908949460b89f17e
Merge: c7b6ed1d8 f229c4e66
Author: Nick Mathewson 
Date:   Wed Nov 7 14:40:34 2018 -0500

Merge branch 'maint-0.3.5'

"ours" to avoid version bump.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Begin work on an 0.3.5.4-alpha changelog

2018-11-07 Thread nickm
commit ef3ec11a5b94ef91c568c42a41a032c2dbec82ca
Author: Nick Mathewson 
Date:   Wed Nov 7 14:46:33 2018 -0500

Begin work on an 0.3.5.4-alpha changelog
---
 ChangeLog | 115 ++
 changes/bug27197  |   3 --
 changes/bug27740  |   4 --
 changes/bug27741  |   5 --
 changes/bug27800  |   4 --
 changes/bug27804  |   3 --
 changes/bug27948  |   6 ---
 changes/bug27963_timeradd |   4 --
 changes/bug27968  |   3 --
 changes/bug28115  |   3 --
 changes/bug28127  |   7 ---
 changes/bug28202  |   4 --
 changes/bug28298  |   4 --
 changes/bug28303  |   3 --
 changes/bug28348_034  |   5 --
 changes/rust_asan |   8 
 changes/ticket27751   |   2 -
 changes/ticket27838   |   4 --
 changes/ticket27913   |   3 --
 changes/ticket27995   |   4 --
 changes/ticket28026   |   3 --
 changes/ticket28113   |   5 --
 changes/ticket28318   |   3 --
 23 files changed, 115 insertions(+), 90 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b29648025..0cbdb9634 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,118 @@
+Changes in version 0.3.5.4-alpha - 2018-11-07
+  Tor 0.3.5.4-alpha includes numerous bugfixes, and continues our
+  attempts to stabilize this alpha branch and build it into a foundation
+  for an acceptable long-term-support release.
+
+  o Major bugfixes (compilation, rust):
+- Rust tests can now build and run successfully with the
+  --enable-fragile-hardening option enabled. Doing this currently
+  requires the rust beta channel; it will be possible with stable
+  rust as of rust version 1.31 is out. Patch from Alex Crichton.
+  Fixes bugs 27272, 27273, and 27274. Bugfix on 0.3.1.1-alpha.
+
+  o Major bugfixes (embedding, main loop):
+- When DisableNetwork becomes set, actually disable periodic events
+  that are already enabled. (Previously, we would refrain from
+  enabling new ones, but we would leave the old ones turned on.)
+  Fixes bug 28348; bugfix on 0.3.4.1-alpha.
+
+  o Minor features (continuous integration):
+- Add a Travis CI build for --enable-nss on Linux gcc. Closes
+  ticket 27751.
+
+  o Minor features (Windows, continuous integration):
+- Build tor on Windows Server 2012 R2 and Windows Server 2016 using
+  Appveyor's CI. Closes ticket 28318.
+
+  o Minor bugfixes (C correctness, also in 0.3.4.9):
+- Avoid undefined behavior in an end-of-string check when parsing
+  the BEGIN line in a directory object. Fixes bug 28202; bugfix
+  on 0.2.0.3-alpha.
+
+  o Minor bugfixes (compilation):
+- Fix a pair of missing headers on OpenBSD. Fixes bug 28303; bugfix
+  on 0.3.5.1-alpha. Patch from Kris Katterjohn.
+
+  o Minor bugfixes (compilation, opensolaris):
+- Add a missing include to compat_pthreads.c, to fix compilation on
+  OpenSolaris and its descendants. Fixes bug 27963; bugfix
+  on 0.3.5.1-alpha.
+
+  o Minor bugfixes (configuration):
+- Resume refusing to start with relative file paths and RunAsDaemon
+  set (regression from the fix for bug 22731). Fixes bug 28298;
+  bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (directory authority, also in 0.3.4.9):
+- Log additional info when we get a relay that shares an ed25519 ID
+  with a different relay, instead making a BUG() warning. Fixes bug
+  27800; bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (hidden service v3):
+- Build the service descriptor signing key certificate before
+  uploading so we always have a fresh one leaving no chances for it
+  to expire service side. Fixes bug 27838; bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (hidden service v3, client authorization):
+- Fix an assert() when adding a client authorization for the first
+  time and then sending a HUP signal to the service. Before that,
+  tor would stop abruptly. Fixes bug 27995; bugfix on 0.3.5.1-alpha.
+
+  o Minor bugfixes (onion services):
+- Unless we have explicitly set HiddenServiceVersion, detect the
+  onion service version and then look for invalid options.
+  Previously, we did the reverse, but that broke existing configs
+  which were pointed to a v2 hidden service and had options like
+  HiddenServiceAuthorizeClient set Fixes bug 28127; bugfix on
+  0.3.5.1-alpha. Patch by Neel Chauhan.
+
+  o Minor bugfixes (portability):
+- Make the OPE code (which is used for v3 onion services) run
+  correctly on big-endian platforms. Fixes bug 28115; bugfix
+  on 0.3.5.1-alpha.
+
+  o Minor bugfixes (protover, rust):
+- Reject extra commas in version string. Fixes bug 27197; bugfix
+  on 0.3.3.3-alpha.
+
+  o Minor bugfixes (relay shutdown, systemd):
+- Notify systemd of ShutdownWaitLength so it can be set to longer
+  than systemd's TimeoutStopSec. In tor's systemd service file, set
+  

[tor-commits] [tor/maint-0.3.5] Bump to 0.3.5.4-alpha

2018-11-07 Thread nickm
commit f229c4e66ae7f92fd02e93f2766ae37c07152ec5
Author: Nick Mathewson 
Date:   Wed Nov 7 14:40:26 2018 -0500

Bump to 0.3.5.4-alpha
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index d0de6356d..1fc49fe90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.3-alpha-dev])
+AC_INIT([tor],[0.3.5.4-alpha])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 5c37dd7ce..088c3e4a6 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.3-alpha-dev"
+!define VERSION "0.3.5.4-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 4c89925d3..9eacbc31f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.3-alpha-dev"
+#define VERSION "0.3.5.4-alpha"
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Bump to 0.3.5.4-alpha

2018-11-07 Thread nickm
commit f229c4e66ae7f92fd02e93f2766ae37c07152ec5
Author: Nick Mathewson 
Date:   Wed Nov 7 14:40:26 2018 -0500

Bump to 0.3.5.4-alpha
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index d0de6356d..1fc49fe90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.3-alpha-dev])
+AC_INIT([tor],[0.3.5.4-alpha])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 5c37dd7ce..088c3e4a6 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.3-alpha-dev"
+!define VERSION "0.3.5.4-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 4c89925d3..9eacbc31f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.3-alpha-dev"
+#define VERSION "0.3.5.4-alpha"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Add Hans-Christoph to the people page

2018-11-07 Thread atagar
commit e1e2a9d17e1508fa705b7a08811bb76d1b1d60e0
Author: Damian Johnson 
Date:   Wed Nov 7 11:50:46 2018 -0800

Add Hans-Christoph to the people page
---
 about/en/corepeople.wml   | 134 +-
 images/people/hc.png  | Bin 0 -> 38444 bytes
 images/people/orig/hc.jpg | Bin 0 -> 149652 bytes
 3 files changed, 72 insertions(+), 62 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index b35e614b..1739cc85 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -311,6 +311,16 @@
 
   
 
+  
+  
+  https://twitter.com/hansstatus;>
+  https://pgp.mit.edu/pks/lookup?op=vindex=0xE9E28DEA00AA5556;>
+  Hans-Christoph Steiner
+  IRC: _hc
+  Works on Orbot, NetCipher, and integrating Tor 
everywhere possible, especially in Debian and Android.  Also deeply mixed into 
Guardian Project.
+
+
+
   
   
   
@@ -318,7 +328,9 @@
   IRC: nyinz
   I am very excited and honored to contribute to 
the Tor project on its mission to provide usable technologies to the global 
south.
 
+  
 
+  
 
   
   
@@ -329,9 +341,7 @@
   Pronoun: http://pronoun.is/he;>he
   https://metrics.torproject.org;>Metrics team member and maintainer of 
https://metrics.torproject.org/rs.html;>Relay Search.
 
-  
 
-  
 
   
   
@@ -340,7 +350,9 @@
   Pronoun: http://pronoun.is/he;>he
   https://cs.uwaterloo.ca/~iang/;>Professor of CS at the https://uwaterloo.ca/;>University of Waterloo, developing https://otr.cypherpunks.ca/;>Off-the-Record Messaging among other 
things.
 
+  
 
+  
 
   
   
@@ -350,9 +362,7 @@
   IRC: igt0
   Works on Tor Browser.
 
-  
 
-  
 
   
   
@@ -361,7 +371,9 @@
   Pronoun: http://pronoun.is/he;>he
   He is one of our main interfaces with the https://tails.boum.org/;>Tails project.
 
+  
 
+  
 
   
   
@@ -371,9 +383,7 @@
   IRC: isabela
   Coordinates Tor's development teams and 
roadmaps. Keeps track of priorities, and ensures Tor always thinks of the 
user first.
 
-  
 
-  
 
   
   
@@ -381,7 +391,9 @@
   isra
   Rewrote the https://gettor.torproject.org;>GetTor service.
 
+  
 
+  
 
   
   
@@ -391,9 +403,7 @@
   IRC: redshiftzero
   Lead developer of the https://securedrop.org/;>SecureDrop whistleblower platform based at 
the https://freedom.press/;>Freedom of the Press Foundation.
 
-  
 
-  
 
   
   
@@ -403,7 +413,9 @@
   IRC: qbi
   Volunteer that helped translate the website, is 
part of TorServers.net, and Tor's sysadmin team.
 
+  
 
+  
 
   
   
@@ -412,9 +424,7 @@
   IRC: jselon
   Event Coordination, donor management, general 
office operations.
 
-  
 
-  
 
   
   
@@ -423,7 +433,9 @@
   IRC: juga
   Contributed to OONI, bug tracker features, 
wrote tordyguards. Currently working on bandwidth scanner.
 
+  
 
+  
 
   
   
@@ -432,9 +444,7 @@
   Julius Mittenzwei
   Germany-based lawyer and Internet 
activist.
 
-  
 
-  
 
   
   
@@ -443,7 +453,9 @@
   IRC: juris
   Board member of torservers.net.
 
+  
 
+  
 
   
   
@@ -453,9 +465,7 @@
   Pronoun: http://pronoun.is/he;>he
   Primary researcher and developer into https://metrics.torproject.org/;>anonymous metrics which started as a 
National Science Foundation grant.
 
-  
 
-  
 
   
   
@@ -465,7 +475,9 @@
   Pronoun: http://pronoun.is/she;>she
   Volunteer on the Community Team. Helps with 
t-shirts for relay operators and other odds and ends.
 
+  
 
+  
 
   
   
@@ -475,9 +487,7 @@
   IRC: ailanthus
   Writes about Tor in mainstream and technical 
publications and conducts community workshops to teach people about Tor.
 
-  
 
-  
 
   
   
@@ -488,16 +498,16 @@
   Pronoun: http://pronoun.is/he;>he
   https://securedrop.org;>SecureDrop 
developer at the https://freedom.press;>Freedom of Press 
Foundation. Member of the community team, privacy advocate focusing on new 
users.
 
+  
 
+  
 
   
   
   Leif Ryge
   Works on security analysis, designer of 
bananaphone transport.
 
-  
 
-  
 
   
   
@@ -507,7 +517,9 @@
   Pronoun: http://pronoun.is/he;>he
   Software developer, sysadmin and co-founder of 
the Swedish Torservers.net partner :DFRI. Member of the sysadmin team. Runs one 
of the directory authorities.
 
+  
 
+  
 
   
   
@@ -517,9 +529,7 @@
   Pronoun: http://pronoun.is/she;>she
   Community team, user advocate, and Mozilla 
fellow.
 
-  
 
-  
 
   
   
@@ -530,7 +540,9 @@
   Pronoun: http://pronoun.is/she;>she
   Maria manages OONI's Partnership Program and 
writes research reports on internet censorship around 

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/271'

2018-11-07 Thread nickm
commit c7b6ed1d8065375e430d54c14f79d3bd0d6abbe5
Merge: 3eeb7c6e2 45b28167d
Author: Nick Mathewson 
Date:   Wed Nov 7 11:21:13 2018 -0500

Merge remote-tracking branch 'tor-github/pr/271'

 changes/bug25885 |  7 +++
 src/core/or/circuitbuild.c   | 21 -
 src/core/or/circuitbuild.h   |  3 ++-
 src/test/test_circuitbuild.c |  4 ++--
 4 files changed, 23 insertions(+), 12 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] In count_acceptable_nodes(), count direct and indirect nodes with node_has_preferred_descriptor()

2018-11-07 Thread nickm
commit 45b28167d7e2b1d5afb26db6f76ca2329a9bbc04
Author: Neel Chauhan 
Date:   Wed Oct 17 21:43:59 2018 -0400

In count_acceptable_nodes(), count direct and indirect nodes with 
node_has_preferred_descriptor()
---
 changes/bug25885 |  7 +++
 src/core/or/circuitbuild.c   | 21 -
 src/core/or/circuitbuild.h   |  3 ++-
 src/test/test_circuitbuild.c |  4 ++--
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/changes/bug25885 b/changes/bug25885
new file mode 100644
index 0..1b89acfe0
--- /dev/null
+++ b/changes/bug25885
@@ -0,0 +1,7 @@
+  o Minor bugfixes (guards):
+- In count_acceptable_nodes(), check if we have at least one bridge
+  or guard node, and two non-guard nodes for a circuit. Previously,
+  we have added up the sum of all nodes with a descriptor, but that
+  could cause us to build circuits that fail if we had either too
+  many bridges, or not enough guard nodes. Fixes bug 25885; bugfix
+  on 0.3.6.1-alpha. Patch by Neel Chauhan.
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index a69457571..4f9f09bc8 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -1658,22 +1658,25 @@ route_len_for_purpose(uint8_t purpose, extend_info_t 
*exit_ei)
 STATIC int
 new_route_len(uint8_t purpose, extend_info_t *exit_ei, smartlist_t *nodes)
 {
-  int num_acceptable_routers;
   int routelen;
 
   tor_assert(nodes);
 
   routelen = route_len_for_purpose(purpose, exit_ei);
 
-  num_acceptable_routers = count_acceptable_nodes(nodes);
+  int num_acceptable_direct = count_acceptable_nodes(nodes, 1);
+  int num_acceptable_indirect = count_acceptable_nodes(nodes, 0);
 
-  log_debug(LD_CIRC,"Chosen route length %d (%d/%d routers suitable).",
-routelen, num_acceptable_routers, smartlist_len(nodes));
+  log_debug(LD_CIRC,"Chosen route length %d (%d direct and %d indirect "
+ "routers suitable).", routelen, num_acceptable_direct,
+ num_acceptable_indirect);
 
-  if (num_acceptable_routers < routelen) {
+  if (num_acceptable_direct < 1 || num_acceptable_indirect < routelen - 1) {
 log_info(LD_CIRC,
- "Not enough acceptable routers (%d/%d). Discarding this circuit.",
- num_acceptable_routers, routelen);
+ "Not enough acceptable routers (%d/%d direct and %d/%d "
+ "indirect routers suitable). Discarding this circuit.",
+ num_acceptable_direct, routelen,
+ num_acceptable_indirect, routelen);
 return -1;
   }
 
@@ -2315,7 +2318,7 @@ circuit_extend_to_new_exit(origin_circuit_t *circ, 
extend_info_t *exit_ei)
  * particular router. See bug #25885.)
  */
 MOCK_IMPL(STATIC int,
-count_acceptable_nodes, (smartlist_t *nodes))
+count_acceptable_nodes, (smartlist_t *nodes, int direct))
 {
   int num=0;
 
@@ -2329,7 +2332,7 @@ count_acceptable_nodes, (smartlist_t *nodes))
 if (! node->is_valid)
 //  log_debug(LD_CIRC,"Nope, the directory says %d is not valid.",i);
   continue;
-if (! node_has_any_descriptor(node))
+if (! node_has_preferred_descriptor(node, direct))
   continue;
 /* The node has a descriptor, so we can just check the ntor key directly */
 if (!node_has_curve25519_onion_key(node))
diff --git a/src/core/or/circuitbuild.h b/src/core/or/circuitbuild.h
index cee71b297..93f903f06 100644
--- a/src/core/or/circuitbuild.h
+++ b/src/core/or/circuitbuild.h
@@ -84,7 +84,8 @@ void circuit_upgrade_circuits_from_guard_wait(void);
 STATIC circid_t get_unique_circ_id_by_chan(channel_t *chan);
 STATIC int new_route_len(uint8_t purpose, extend_info_t *exit_ei,
  smartlist_t *nodes);
-MOCK_DECL(STATIC int, count_acceptable_nodes, (smartlist_t *nodes));
+MOCK_DECL(STATIC int, count_acceptable_nodes, (smartlist_t *nodes,
+   int direct));
 
 STATIC int onion_extend_cpath(origin_circuit_t *circ);
 
diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c
index 02eadecd9..dd47ad768 100644
--- a/src/test/test_circuitbuild.c
+++ b/src/test/test_circuitbuild.c
@@ -21,11 +21,11 @@ static smartlist_t dummy_nodes;
 static extend_info_t dummy_ei;
 
 static int
-mock_count_acceptable_nodes(smartlist_t *nodes)
+mock_count_acceptable_nodes(smartlist_t *nodes, int direct)
 {
   (void)nodes;
 
-  return DEFAULT_ROUTE_LEN + 1;
+  return direct ? 1 : DEFAULT_ROUTE_LEN + 1;
 }
 
 /* Test route lengths when the caller of new_route_len() doesn't



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Appveyor: Add Windows Server 2016 to tor's build matrix

2018-11-07 Thread nickm
commit 368aeaadffa9005febbcdf55c813812771dfe6f1
Author: teor 
Date:   Mon Nov 5 16:21:58 2018 +1000

Appveyor: Add Windows Server 2016 to tor's build matrix

Build tor on Windows Server 2012 R2 and Windows Server 2016 using
Appveyor's CI.

Closes ticket 28318.
---
 .appveyor.yml   | 6 ++
 changes/ticket28318 | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d8927ee3..c8db2505f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,6 +2,12 @@ version: 1.0.{build}
 
 clone_depth: 50
 
+image:
+  # Windows Server 2012 R2
+  - Visual Studio 2015
+  # Windows Server 2016
+  - Visual Studio 2017
+
 environment:
   compiler: mingw
 
diff --git a/changes/ticket28318 b/changes/ticket28318
new file mode 100644
index 0..24dc1e958
--- /dev/null
+++ b/changes/ticket28318
@@ -0,0 +1,3 @@
+  o Minor features (Windows, continuous integration):
+- Build tor on Windows Server 2012 R2 and Windows Server 2016 using
+  Appveyor's CI. Closes ticket 28318.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5

2018-11-07 Thread nickm
commit aea2b0446785b76d09bb1a615acc2d0976a87c0d
Merge: c60f3ea60 368aeaadf
Author: Nick Mathewson 
Date:   Wed Nov 7 11:16:52 2018 -0500

Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5

 .appveyor.yml   | 6 ++
 changes/ticket28318 | 3 +++
 2 files changed, 9 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-11-07 Thread nickm
commit 3eeb7c6e26d4e43873a01da6e3926ca33baf54dc
Merge: 6e828ced5 aea2b0446
Author: Nick Mathewson 
Date:   Wed Nov 7 11:17:32 2018 -0500

Merge branch 'maint-0.3.5'

 .appveyor.yml   | 6 ++
 changes/ticket28318 | 3 +++
 2 files changed, 9 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5

2018-11-07 Thread nickm
commit aea2b0446785b76d09bb1a615acc2d0976a87c0d
Merge: c60f3ea60 368aeaadf
Author: Nick Mathewson 
Date:   Wed Nov 7 11:16:52 2018 -0500

Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5

 .appveyor.yml   | 6 ++
 changes/ticket28318 | 3 +++
 2 files changed, 9 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5

2018-11-07 Thread nickm
commit aea2b0446785b76d09bb1a615acc2d0976a87c0d
Merge: c60f3ea60 368aeaadf
Author: Nick Mathewson 
Date:   Wed Nov 7 11:16:52 2018 -0500

Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5

 .appveyor.yml   | 6 ++
 changes/ticket28318 | 3 +++
 2 files changed, 9 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/maint-0.3.5] Appveyor: Add Windows Server 2016 to tor's build matrix

2018-11-07 Thread nickm
commit 368aeaadffa9005febbcdf55c813812771dfe6f1
Author: teor 
Date:   Mon Nov 5 16:21:58 2018 +1000

Appveyor: Add Windows Server 2016 to tor's build matrix

Build tor on Windows Server 2012 R2 and Windows Server 2016 using
Appveyor's CI.

Closes ticket 28318.
---
 .appveyor.yml   | 6 ++
 changes/ticket28318 | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d8927ee3..c8db2505f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,6 +2,12 @@ version: 1.0.{build}
 
 clone_depth: 50
 
+image:
+  # Windows Server 2012 R2
+  - Visual Studio 2015
+  # Windows Server 2016
+  - Visual Studio 2017
+
 environment:
   compiler: mingw
 
diff --git a/changes/ticket28318 b/changes/ticket28318
new file mode 100644
index 0..24dc1e958
--- /dev/null
+++ b/changes/ticket28318
@@ -0,0 +1,3 @@
+  o Minor features (Windows, continuous integration):
+- Build tor on Windows Server 2012 R2 and Windows Server 2016 using
+  Appveyor's CI. Closes ticket 28318.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/release-0.3.5] Appveyor: Add Windows Server 2016 to tor's build matrix

2018-11-07 Thread nickm
commit 368aeaadffa9005febbcdf55c813812771dfe6f1
Author: teor 
Date:   Mon Nov 5 16:21:58 2018 +1000

Appveyor: Add Windows Server 2016 to tor's build matrix

Build tor on Windows Server 2012 R2 and Windows Server 2016 using
Appveyor's CI.

Closes ticket 28318.
---
 .appveyor.yml   | 6 ++
 changes/ticket28318 | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d8927ee3..c8db2505f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,6 +2,12 @@ version: 1.0.{build}
 
 clone_depth: 50
 
+image:
+  # Windows Server 2012 R2
+  - Visual Studio 2015
+  # Windows Server 2016
+  - Visual Studio 2017
+
 environment:
   compiler: mingw
 
diff --git a/changes/ticket28318 b/changes/ticket28318
new file mode 100644
index 0..24dc1e958
--- /dev/null
+++ b/changes/ticket28318
@@ -0,0 +1,3 @@
+  o Minor features (Windows, continuous integration):
+- Build tor on Windows Server 2012 R2 and Windows Server 2016 using
+  Appveyor's CI. Closes ticket 28318.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] simplify now that it uses tor's copyright and license

2018-11-07 Thread arma
commit 6e828ced56c04aa38fa6e2d595528bf0d046ca8c
Author: Roger Dingledine 
Date:   Wed Nov 7 11:02:26 2018 -0500

simplify now that it uses tor's copyright and license
---
 src/lib/cc/ctassert.h | 30 ++
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h
index ea3a3e119..e42976360 100644
--- a/src/lib/cc/ctassert.h
+++ b/src/lib/cc/ctassert.h
@@ -1,31 +1,5 @@
-/*-
- * Copyright (c) 2018 The Tor Project, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- * 3. Neither the names of the copyright owners nor the names of its
- *contributors may be used to endorse or promote products derived from
- *this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
+/* Copyright (c) 2018 The Tor Project, Inc. */
+/* See LICENSE for licensing information */
 
 /**
  * \file ctassert.h

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Change version on master to 0.4.0.0-alpha-dev.

2018-11-07 Thread nickm
commit 9e48d9a920c1e1f8c6fc551363b28905f5580f8e
Author: Nick Mathewson 
Date:   Wed Nov 7 10:54:03 2018 -0500

Change version on master to 0.4.0.0-alpha-dev.
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index b80aa821a..4524c6b46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.6.0-alpha-dev])
+AC_INIT([tor],[0.4.0.0-alpha-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8b9b70969..af01a2b49 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.6.0-alpha-dev"
+!define VERSION "0.4.0.0-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index de3bf0928..cfc3bc9e9 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.6.0-alpha-dev"
+#define VERSION "0.4.0.0-alpha-dev"
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Merge branch 'ticket27225_squashed'

2018-11-07 Thread nickm
commit 9807da9c20d5504a1669c70c1607b40731664e07
Merge: a7a060a63 6d9382049
Author: Nick Mathewson 
Date:   Wed Nov 7 10:47:29 2018 -0500

Merge branch 'ticket27225_squashed'

 changes/ticket27225|  5 +++
 src/app/main/main.c|  2 ++
 src/core/or/versions.c | 82 +-
 src/core/or/versions.h |  2 ++
 4 files changed, 76 insertions(+), 15 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Memoize summarize_protover_flags()

2018-11-07 Thread nickm
commit 6d93820499a8bfb19128759893b18c1437f99c6b
Author: Nick Mathewson 
Date:   Fri Oct 19 15:04:45 2018 -0400

Memoize summarize_protover_flags()

Our tests showed that this function is responsible for a huge number
of our malloc/free() calls.  It's a prime candidate for being
memoized.

Closes ticket 27225.
---
 changes/ticket27225|  5 +++
 src/app/main/main.c|  2 ++
 src/core/or/versions.c | 82 +-
 src/core/or/versions.h |  2 ++
 4 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/changes/ticket27225 b/changes/ticket27225
new file mode 100644
index 0..4c05a269d
--- /dev/null
+++ b/changes/ticket27225
@@ -0,0 +1,5 @@
+  o Minor features (performance):
+- Avoid parsing the same protocol-versions string over and over
+  in summarize_protover_flags(). This should save us a huge number
+  of malloc calls on startup, and may reduce memory fragmentation with
+  some allocators. Closes ticket 27225.
diff --git a/src/app/main/main.c b/src/app/main/main.c
index ae87add67..04bbfadcb 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -33,6 +33,7 @@
 #include "core/or/relay.h"
 #include "core/or/scheduler.h"
 #include "core/or/status.h"
+#include "core/or/versions.h"
 #include "feature/api/tor_api.h"
 #include "feature/api/tor_api_internal.h"
 #include "feature/client/addressmap.h"
@@ -791,6 +792,7 @@ tor_free_all(int postfork)
   dos_free_all();
   circuitmux_ewma_free_all();
   accounting_free_all();
+  protover_summary_cache_free_all();
 
   if (!postfork) {
 config_free_all();
diff --git a/src/core/or/versions.c b/src/core/or/versions.c
index 06274996a..6f8eea7a6 100644
--- a/src/core/or/versions.c
+++ b/src/core/or/versions.c
@@ -377,6 +377,62 @@ sort_version_list(smartlist_t *versions, int 
remove_duplicates)
 smartlist_uniq(versions, compare_tor_version_str_ptr_, tor_free_);
 }
 
+/** If there are more than this many entries, we're probably under
+ * some kind of weird DoS. */
+static const int MAX_PROTOVER_SUMMARY_MAP_LEN = 1024;
+
+/**
+ * Map from protover string to protover_summary_flags_t.
+ */
+static strmap_t *protover_summary_map = NULL;
+
+/**
+ * Helper.  Given a non-NULL protover string protocols, set out
+ * to its summary, and memoize the result in protover_summary_map.
+ */
+static void
+memoize_protover_summary(protover_summary_flags_t *out,
+ const char *protocols)
+{
+  if (!protover_summary_map)
+protover_summary_map = strmap_new();
+
+  if (strmap_size(protover_summary_map) >= MAX_PROTOVER_SUMMARY_MAP_LEN) {
+protover_summary_cache_free_all();
+  }
+
+  const protover_summary_flags_t *cached =
+strmap_get(protover_summary_map, protocols);
+
+  if (cached != NULL) {
+/* We found a cached entry; no need to parse this one. */
+memcpy(out, cached, sizeof(protover_summary_flags_t));
+tor_assert(out->protocols_known);
+return;
+  }
+
+  memset(out, 0, sizeof(*out));
+  out->protocols_known = 1;
+  out->supports_extend2_cells =
+protocol_list_supports_protocol(protocols, PRT_RELAY, 2);
+  out->supports_ed25519_link_handshake_compat =
+protocol_list_supports_protocol(protocols, PRT_LINKAUTH, 3);
+  out->supports_ed25519_link_handshake_any =
+protocol_list_supports_protocol_or_later(protocols, PRT_LINKAUTH, 3);
+  out->supports_ed25519_hs_intro =
+protocol_list_supports_protocol(protocols, PRT_HSINTRO, 4);
+  out->supports_v3_hsdir =
+protocol_list_supports_protocol(protocols, PRT_HSDIR,
+PROTOVER_HSDIR_V3);
+  out->supports_v3_rendezvous_point =
+protocol_list_supports_protocol(protocols, PRT_HSREND,
+PROTOVER_HS_RENDEZVOUS_POINT_V3);
+
+  protover_summary_flags_t *new_cached = tor_memdup(out, sizeof(*out));
+  cached = strmap_set(protover_summary_map, protocols, new_cached);
+  tor_assert(!cached);
+}
+
 /** Summarize the protocols listed in protocols into out,
  * falling back or correcting them based on version as appropriate.
  */
@@ -388,21 +444,7 @@ summarize_protover_flags(protover_summary_flags_t *out,
   tor_assert(out);
   memset(out, 0, sizeof(*out));
   if (protocols) {
-out->protocols_known = 1;
-out->supports_extend2_cells =
-  protocol_list_supports_protocol(protocols, PRT_RELAY, 2);
-out->supports_ed25519_link_handshake_compat =
-  protocol_list_supports_protocol(protocols, PRT_LINKAUTH, 3);
-out->supports_ed25519_link_handshake_any =
-  protocol_list_supports_protocol_or_later(protocols, PRT_LINKAUTH, 3);
-out->supports_ed25519_hs_intro =
-  protocol_list_supports_protocol(protocols, PRT_HSINTRO, 4);
-out->supports_v3_hsdir =
-  protocol_list_supports_protocol(protocols, PRT_HSDIR,
-  PROTOVER_HSDIR_V3);
-out->supports_v3_rendezvous_point =
-  protocol_list_supports_protocol(protocols, PRT_HSREND,
-  

[tor-commits] [tor/master] Remove a tab.

2018-11-07 Thread nickm
commit 6b706bcf199b82c6b1a87c839e8d13bf9d8e60b7
Author: Nick Mathewson 
Date:   Tue Nov 6 15:41:32 2018 -0500

Remove a tab.
---
 src/lib/cc/ctassert.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h
index 5a1b137cb..674c0c2e1 100644
--- a/src/lib/cc/ctassert.h
+++ b/src/lib/cc/ctassert.h
@@ -38,7 +38,7 @@
 /**
  * CTASSERT(expression)
  *
- * Trigger a compiler error if expression is false.
+ *   Trigger a compiler error if expression is false.
  */
 #if __STDC_VERSION__ >= 201112L
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Add parentheses to the ctassert macro expansions

2018-11-07 Thread nickm
commit 3c9dd9ef2d86463e535952528bc5151ce499a74f
Author: Nick Mathewson 
Date:   Tue Nov 6 15:41:14 2018 -0500

Add parentheses to the ctassert macro expansions
---
 src/lib/cc/ctassert.h | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h
index 7307bca53..5a1b137cb 100644
--- a/src/lib/cc/ctassert.h
+++ b/src/lib/cc/ctassert.h
@@ -43,7 +43,7 @@
 #if __STDC_VERSION__ >= 201112L
 
 /* If C11 is available, just use _Static_assert.  */
-#define CTASSERT(x) _Static_assert(x, #x)
+#define CTASSERT(x) _Static_assert((x), #x)
 
 #else
 
@@ -59,11 +59,12 @@
  * error.
  */
 #if defined(__COUNTER__)
-#define CTASSERT(x) CTASSERT_EXPN(x, c, __COUNTER__)
+#define CTASSERT(x) CTASSERT_EXPN((x), c, __COUNTER__)
 #elif defined(__INCLUDE_LEVEL__)
-#define CTASSERT(x) CTASSERT_EXPN(x, __INCLUDE_LEVEL__, __LINE__)
+#define CTASSERT(x) CTASSERT_EXPN((x), __INCLUDE_LEVEL__, __LINE__)
 #else
-#define CTASSERT(x) CTASSERT_EXPN(x, l, __LINE__) /* hope it's unique enough */
+/* hope it's unique enough */
+#define CTASSERT(x) CTASSERT_EXPN((x), l, __LINE__)
 #endif
 
 #define CTASSERT_EXPN(x, a, b) CTASSERT_DECL(x, a, b)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Switch ctassert.h to 3bsd (with permission)

2018-11-07 Thread nickm
commit a7a060a637ac714abdb3f944df130a7c9b14
Author: Nick Mathewson 
Date:   Wed Nov 7 10:37:02 2018 -0500

Switch ctassert.h to 3bsd (with permission)
---
 src/lib/cc/ctassert.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h
index c6de3bf1e..ea3a3e119 100644
--- a/src/lib/cc/ctassert.h
+++ b/src/lib/cc/ctassert.h
@@ -10,6 +10,9 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright owners nor the names of its
+ *contributors may be used to endorse or promote products derived from
+ *this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Allow lib/cc to include its own files.

2018-11-07 Thread nickm
commit 770653ff456c9ae9ecf29008f7abf367a776e557
Author: Nick Mathewson 
Date:   Tue Nov 6 16:59:39 2018 -0500

Allow lib/cc to include its own files.
---
 src/lib/cc/.may_include | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/cc/.may_include b/src/lib/cc/.may_include
index 2b06e8519..fa1478ce4 100644
--- a/src/lib/cc/.may_include
+++ b/src/lib/cc/.may_include
@@ -1 +1,2 @@
 orconfig.h
+lib/cc/*.h
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Change copyright statement (with permission)

2018-11-07 Thread nickm
commit d9508d8ede7ecbdfa35ce8a12c6e1d66d1bbb4b7
Author: Nick Mathewson 
Date:   Tue Nov 6 15:42:18 2018 -0500

Change copyright statement (with permission)
---
 src/lib/cc/ctassert.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h
index 674c0c2e1..c6de3bf1e 100644
--- a/src/lib/cc/ctassert.h
+++ b/src/lib/cc/ctassert.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2018 Taylor R. Campbell
+ * Copyright (c) 2018 The Tor Project, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Add a user of CTASSERT().

2018-11-07 Thread nickm
commit e69a4ad6b321dbdb63236687ac8924c301c60f9d
Author: Nick Mathewson 
Date:   Tue Nov 6 15:39:58 2018 -0500

Add a user of CTASSERT().
---
 src/lib/net/address.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/net/address.c b/src/lib/net/address.c
index c97a17037..a351b9df2 100644
--- a/src/lib/net/address.c
+++ b/src/lib/net/address.c
@@ -40,6 +40,7 @@
 
 #include "lib/net/address.h"
 #include "lib/net/socket.h"
+#include "lib/cc/ctassert.h"
 #include "lib/container/smartlist.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/log/log.h"
@@ -98,6 +99,7 @@
 #if AF_UNSPEC != 0
 #error We rely on AF_UNSPEC being 0. Let us know about your platform, please!
 #endif
+CTASSERT(AF_UNSPEC == 0);
 
 /** Convert the tor_addr_t in a, with port in port, into a
  * sockaddr object in *sa_out of object size len.  If not enough



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] New macro CTASSERT(condition) to assert condition at compile-time.

2018-11-07 Thread nickm
commit 1a6060fa4263d20d3c1ccf29163165126a413957
Author: Taylor R Campbell 
Date:   Tue Oct 23 23:53:39 2018 +

New macro CTASSERT(condition) to assert condition at compile-time.

To get it, use: #include "lib/cc/ctassert.h"
---
 src/lib/cc/ctassert.h | 75 +++
 src/lib/cc/include.am |  1 +
 2 files changed, 76 insertions(+)

diff --git a/src/lib/cc/ctassert.h b/src/lib/cc/ctassert.h
new file mode 100644
index 0..7307bca53
--- /dev/null
+++ b/src/lib/cc/ctassert.h
@@ -0,0 +1,75 @@
+/*-
+ * Copyright (c) 2018 Taylor R. Campbell
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/**
+ * \file ctassert.h
+ *
+ * \brief Compile-time assertions: CTASSERT(expression).
+ */
+
+#ifndef TOR_CTASSERT_H
+#define TOR_CTASSERT_H
+
+#include "lib/cc/compat_compiler.h"
+
+/**
+ * CTASSERT(expression)
+ *
+ * Trigger a compiler error if expression is false.
+ */
+#if __STDC_VERSION__ >= 201112L
+
+/* If C11 is available, just use _Static_assert.  */
+#define CTASSERT(x) _Static_assert(x, #x)
+
+#else
+
+/*
+ * If C11 is not available, expand __COUNTER__, or __INCLUDE_LEVEL__
+ * and __LINE__, or just __LINE__, with an intermediate preprocessor
+ * macro CTASSERT_EXPN, and then use CTASSERT_DECL to paste the
+ * expansions together into a unique name.
+ *
+ * We use this name as a typedef of an array type with a positive
+ * length if the assertion is true, and a negative length of the
+ * assertion is false, which is invalid and hence triggers a compiler
+ * error.
+ */
+#if defined(__COUNTER__)
+#define CTASSERT(x) CTASSERT_EXPN(x, c, __COUNTER__)
+#elif defined(__INCLUDE_LEVEL__)
+#define CTASSERT(x) CTASSERT_EXPN(x, __INCLUDE_LEVEL__, __LINE__)
+#else
+#define CTASSERT(x) CTASSERT_EXPN(x, l, __LINE__) /* hope it's unique enough */
+#endif
+
+#define CTASSERT_EXPN(x, a, b) CTASSERT_DECL(x, a, b)
+#define CTASSERT_DECL(x, a, b) \
+  typedef char tor_ctassert_##a##_##b[(x) ? 1 : -1] ATTR_UNUSED
+
+#endif
+
+#endif /* !defined(TOR_CTASSERT_H) */
diff --git a/src/lib/cc/include.am b/src/lib/cc/include.am
index 2ae90f97d..52cf8a9f7 100644
--- a/src/lib/cc/include.am
+++ b/src/lib/cc/include.am
@@ -1,4 +1,5 @@
 
 noinst_HEADERS += \
src/lib/cc/compat_compiler.h \
+   src/lib/cc/ctassert.h \
src/lib/cc/torint.h



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-11-07 Thread translation
commit 9f9d6049ece32236e9eab338b966af2e4d130a8d
Author: Translation commit bot 
Date:   Wed Nov 7 15:15:06 2018 +

Update translations for abouttor-homepage
---
 hr_HR/aboutTor.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hr_HR/aboutTor.dtd b/hr_HR/aboutTor.dtd
index 6107e5cd5..30454f899 100644
--- a/hr_HR/aboutTor.dtd
+++ b/hr_HR/aboutTor.dtd
@@ -29,11 +29,11 @@
 
 
 
-
-
-
+
+
+
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Update css for banner

2018-11-07 Thread hiro
commit 43885b3803e865d207038fb4de2091a3b141ee9d
Author: hiro 
Date:   Wed Nov 7 15:05:57 2018 +0100

Update css for banner
---
 css/layout.css | 7 ---
 css/layout.min.css | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/css/layout.css b/css/layout.css
index 4b18d223..db89f7c7 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -1531,7 +1531,7 @@ mark {
   width: 100%;
   align-content: center;
   font-size-adjust: 0.7;
-  line-height: 1.5em;
+  line-height: 1.0em;
 }
 
 /* Checkbox Hack */
@@ -1550,8 +1550,9 @@ label {
   color: white;
   float: right;
   font-weight: bold;
-  padding-right: 5px;
-  padding-top: 5px;
+  padding-right: 15px;
+  padding-top: 15px;
+  font-size: 20px;
 }
 
 #eoy-banner {
diff --git a/css/layout.min.css b/css/layout.min.css
index 130283a0..eb48f1fb 100644
--- a/css/layout.min.css
+++ b/css/layout.min.css
@@ -130,7 +130,7 @@ mark {
   width: 100%;
   align-content: center;
   font-size-adjust: 0.7;
-  line-height: 1.5em;
+  line-height: 1.0em;
 }
 
 /* Checkbox Hack */
@@ -149,8 +149,9 @@ label {
   color: white;
   float: right;
   font-weight: bold;
-  padding-right: 5px;
-  padding-top: 5px;
+  padding-right: 15px;
+  padding-top: 15px;
+  font-size: 20px;
 }
 
 #eoy-banner {

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd

2018-11-07 Thread translation
commit 3f7eb57ddfa7078690f57b1557ad85d7c02a6682
Author: Translation commit bot 
Date:   Wed Nov 7 10:17:10 2018 +

Update translations for tba-android_stringsdtd
---
 ja/android_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja/android_strings.dtd b/ja/android_strings.dtd
index b4836a274..55c9c16c4 100644
--- a/ja/android_strings.dtd
+++ b/ja/android_strings.dtd
@@ -380,7 +380,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2018-11-07 Thread translation
commit 2bc873569a5bd80ca296a052d0ff40bf86533349
Author: Translation commit bot 
Date:   Wed Nov 7 09:47:08 2018 +

Update translations for tails-persistence-setup_completed
---
 sv/sv.po | 382 ---
 1 file changed, 192 insertions(+), 190 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index c9e47ea3f..34f16216e 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -7,6 +7,7 @@
 # Anders Nilsson , 2015
 # Filip Nyquist , 2015
 # Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018
 # miccav, 2014
 # phst, 2014
 # leveebreaks, 2014
@@ -14,11 +15,11 @@
 # WinterFairy , 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2018-04-12 18:58+\n"
-"Last-Translator: IDRASSI Mounir \n"
+"POT-Creation-Date: 2018-11-01 12:21+0100\n"
+"PO-Revision-Date: 2018-11-07 09:41+\n"
+"Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,307 +27,308 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:48
-msgid "Personal Data"
-msgstr "Personlig data"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:50
-msgid "Keep files stored in the `Persistent' directory"
-msgstr "Behåll filer lagrade i katalogen `Persistent'"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:58
-msgid "GnuPG"
-msgstr "GnuPG"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:60
-msgid "GnuPG keyrings and configuration"
-msgstr "GnuPG nyckelringar och konfiguration"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:68
-msgid "SSH Client"
-msgstr "SSH-klient"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "SSH keys, configuration and known hosts"
-msgstr "SSH-nycklar, konfiguration och kända värdar"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:78
-msgid "Pidgin"
-msgstr "Pidgin"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:80
-msgid "Pidgin profiles and OTR keyring"
-msgstr "Pidgin-profiler och OTR-nyckelring"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Thunderbird"
-msgstr "Thunderbird"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Thunderbird profiles and locally stored email"
-msgstr "Thunderbird-profiler och lokalt lagrade e-postmeddelanden"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
-msgid "GNOME Keyring"
-msgstr "GNOME Keyring"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
-msgid "Secrets stored by GNOME Keyring"
-msgstr "Lösenord sparade av GNOME Keyring"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
-msgid "Network Connections"
-msgstr "Nätverksanslutningar"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
-msgid "Configuration of network devices and connections"
-msgstr "Konfiguration av nätverksenheter och anslutningar"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
-msgid "Browser bookmarks"
-msgstr "Bokmärken i webbläsaren"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
-msgid "Bookmarks saved in the Tor Browser"
-msgstr "Bokmärken sparade i Tor Browser"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
-msgid "Printers"
-msgstr "Skrivare"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
-msgid "Printers configuration"
-msgstr "Konfiguration av skrivare"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
-msgid "Bitcoin client"
-msgstr "Bitcoin Klienten"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
-msgid "Electrum's bitcoin wallet and configuration"
-msgstr "Electrum's bitcoin plånbok och konfiguration"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
-msgid "APT Packages"
-msgstr "APT-paket"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
-msgid "Packages downloaded by APT"
-msgstr "Paket hämtade av APT"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
-msgid "APT Lists"
-msgstr "APT listor"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
-msgid "Lists downloaded by APT"
-msgstr "Listor hämtade av APT"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:168
-msgid "Dotfiles"
-msgstr "Punktfiler"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:170
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "Länka in i $HOME varje fil och katalog som finns i `dotfiles' 
katalogen"
-
-#: ../lib/Tails/Persistence/Setup.pm:230
+#: ../lib/Tails/Persistence/Setup.pm:265
 msgid "Setup Tails persistent volume"
 msgstr "Konfigurera bestående lagring för Tails"
 
-#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459
+#: ../lib/Tails/Persistence/Setup.pm:343 

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-11-07 Thread translation
commit 8e14b0b0b23e04e29249e519b2e9c36f81c6a98d
Author: Translation commit bot 
Date:   Wed Nov 7 09:47:01 2018 +

Update translations for tails-persistence-setup
---
 sv/sv.po | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 305713410..34f16216e 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-11-01 12:21+0100\n"
-"PO-Revision-Date: 2018-11-07 08:52+\n"
+"PO-Revision-Date: 2018-11-07 09:41+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -55,28 +55,28 @@ msgstr "Enhet %s innehåller ingen partition för 
bestående lagring."
 msgid ""
 "Cannot delete the persistent volume on %s while in use. You should restart "
 "Tails without persistence."
-msgstr "Det går inte att ta bort den beständiga volymen på %s när den 
används. Du bör starta om Tails utan bestånd."
+msgstr "Det går inte att ta bort den bestående volymen på %s när den 
används. Du bör starta om Tails utan bestånd."
 
 #: ../lib/Tails/Persistence/Setup.pm:407
 #, perl-format
 msgid "Persistence volume on %s is not unlocked."
-msgstr ""
+msgstr "Bestående volym på %s är inte upplåst."
 
 #: ../lib/Tails/Persistence/Setup.pm:412
 #, perl-format
 msgid "Persistence volume on %s is not mounted."
-msgstr ""
+msgstr "Bestående volym på %s är inte monterad."
 
 #: ../lib/Tails/Persistence/Setup.pm:417
 #, perl-format
 msgid ""
 "Persistence volume on %s is not readable. Permissions or ownership problems?"
-msgstr ""
+msgstr "Bestående volym på %s är inte läsbar. Behörighets eller 
äganderättsproblem?"
 
 #: ../lib/Tails/Persistence/Setup.pm:422
 #, perl-format
 msgid "Persistence volume on %s is not writable."
-msgstr ""
+msgstr "Bestående volym på %s är inte skrivbar."
 
 #: ../lib/Tails/Persistence/Setup.pm:431
 #, perl-format
@@ -222,7 +222,7 @@ msgid ""
 "Beware! Using persistence has consequences that must be well "
 "understood. Tails can't help you if you use it wrong! See the Encrypted "
 "persistence page of the Tails documentation to learn more."
-msgstr ""
+msgstr "Akta dig! Att använda uthållighet har konsekvenser som måste 
förstås väl. Tails kan inte hjälpa dig om du använder det fel! Läs mer 
på sidan Krypterad bestående i Tails-dokumentationen."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:170
 msgid "Passphrase:"
@@ -265,11 +265,11 @@ msgstr "Behörigheterna på den bestående lagringen 
kommer att rättas till."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:315
 msgid "Creating default persistence configuration."
-msgstr ""
+msgstr "Skapa standard bestående konfiguration."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:318
 msgid "The default persistence configuration will be created."
-msgstr ""
+msgstr "Standardkonfigurationen för bestående skapas."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:333
 msgid "Creating..."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-11-07 Thread translation
commit d3c2f507637acf0749ba8917c269c8769e5c5f92
Author: Translation commit bot 
Date:   Wed Nov 7 09:46:07 2018 +

Update translations for tails-misc
---
 sv.po | 108 +-
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/sv.po b/sv.po
index 1274e82b0..6bf3decee 100644
--- a/sv.po
+++ b/sv.po
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-31 16:04+0100\n"
-"PO-Revision-Date: 2018-11-07 09:16+\n"
+"PO-Revision-Date: 2018-11-07 09:36+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -63,13 +63,13 @@ msgstr "Hjälp oss att fixa ditt fel!\nLäs våra ins
 msgid ""
 "You can install additional software automatically from your persistent "
 "storage when starting Tails."
-msgstr "Du kan installera extra program automatiskt från din kvarhållande 
lagring när du startar Tails."
+msgstr "Du kan installera extra program automatiskt från din bestående 
lagring när du startar Tails."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
 msgid ""
 "The following software is installed automatically from your persistent "
 "storage when starting Tails."
-msgstr "Följande program installeras automatiskt från din kvarhållande 
lagring när Tails startas."
+msgstr "Följande program installeras automatiskt från din bestående lagring 
när Tails startas."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:172
@@ -81,7 +81,7 @@ msgstr "För att lägga till mer, installera lite program med 
Tails "
 "Installer."
-msgstr ""
+msgstr "För att göra det måste du köra Tails från ett USB-minne 
installerat med Tails Installer."
 
 #. Translators: Don't translate {packages}, it's a placeholder and will be
 #. replaced.
@@ -263,7 +263,7 @@ msgstr "Ta bort {packages} från dina extra program?"
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363
 #, python-brace-format
 msgid "This will stop installing {packages} automatically."
-msgstr ""
+msgstr "Detta kommer att sluta installera {packages} automatiskt."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365
 msgid "Remove"
@@ -277,11 +277,11 @@ msgstr "Avbryt"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544
 msgid "Installing your additional software from persistent storage..."
-msgstr "Installera dina extra program från kvarhållande lagring..."
+msgstr "Installera dina extra program från bestående lagring..."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546
 msgid "This can take several minutes."
-msgstr ""
+msgstr "Detta kan ta flera minuter."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559
 msgid "The installation of your additional software failed"
@@ -300,7 +300,7 @@ msgstr "Kontrollen för uppgraderingar av dina extra 
program misslyckades"
 msgid ""
 "Please check your network connection, restart Tails, or read the system log "
 "to understand the problem."
-msgstr ""
+msgstr "Kontrollera din nätverksanslutning, starta om Tails, eller läs 
systemloggen för att förstå problemet."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603
 msgid "The upgrade of your additional software failed"
@@ -324,7 +324,7 @@ msgstr "Ta bort {package} från dina extra program? Detta 
kommer att sluta insta
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:107
 #, python-brace-format
 msgid "Failed to remove {pkg}"
-msgstr ""
+msgstr "Det gick inte att ta bort {pkg}"
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:124
 msgid "Failed to read additional software configuration"
@@ -335,14 +335,14 @@ msgstr "Det gick inte att läsa extra 
programkonfiguration"
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
 #, python-brace-format
 msgid "Stop installing {package} automatically"
-msgstr ""
+msgstr "Sluta installera {package} automatiskt"
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:179
 msgid ""
 "To do so, install some software using Synaptic "
 "Package Manager or APT on the "
 "command line."
-msgstr ""
+msgstr "För att göra det, installera något program med Synaptic pakethanteraren eller APT på kommandoraden."
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:188
 msgid ""
@@ -350,24 +350,24 @@ msgid ""
 "some software using Synaptic Package "
 "Manager or APT on the command "
 "line."
-msgstr ""
+msgstr "För att göra det, lås upp din bestående lagring när du startar 
Tails och installera 

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-11-07 Thread translation
commit dc73e5975b0e6cd4f97961cd38019f5661aae588
Author: Translation commit bot 
Date:   Wed Nov 7 09:46:13 2018 +

Update translations for tails-misc_completed
---
 sv.po | 497 +++---
 1 file changed, 450 insertions(+), 47 deletions(-)

diff --git a/sv.po b/sv.po
index a7cbab368..6bf3decee 100644
--- a/sv.po
+++ b/sv.po
@@ -22,10 +22,10 @@
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-06-10 09:00+\n"
+"POT-Creation-Date: 2018-10-31 16:04+0100\n"
+"PO-Revision-Date: 2018-11-07 09:36+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgstr "Tor är redo"
 msgid "You can now access the Internet."
 msgstr "Du har nu tillgång till internet."
 
-#: config/chroot_local-includes/etc/whisperback/config.py:65
+#: config/chroot_local-includes/etc/whisperback/config.py:69
 #, python-format
 msgid ""
 "Help us fix your bug!\n"
@@ -59,6 +59,30 @@ msgid ""
 "\n"
 msgstr "Hjälp oss att fixa ditt fel!\nLäs våra 
instruktioner för att rapportera fel.\nInkludera inte mer 
personlig information än nödvändigt!\nOm att ge oss din 
e-postadress\n\nAtt ge oss din e-postadress gör det möjligt för oss 
att komma i kontakt med dig för att reda ut problemet. Det här är 
nödvändigt för den stora majoriteten av rapporterna vi tar emot eftersom att 
de flesta rapporter utan kontaktinformation är oanvändbara. Å andra sidan 
ger det också en möjlighet för obehöriga, som din e-post- eller 
Internetleverantör, att bekräfta att du använder Tails.\n\n"
 
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
+msgid ""
+"You can install additional software automatically from your persistent "
+"storage when starting Tails."
+msgstr "Du kan installera extra program automatiskt från din bestående 
lagring när du startar Tails."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
+msgid ""
+"The following software is installed automatically from your persistent "
+"storage when starting Tails."
+msgstr "Följande program installeras automatiskt från din bestående lagring 
när Tails startas."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132
+#: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:172
+msgid ""
+"To add more, install some software using Synaptic Package Manager or APT on the command line."
+msgstr "För att lägga till mer, installera lite program med Synaptic pakethanterare eller APT på kommandoraden."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151
+msgid "_Create persistent storage"
+msgstr "_Skapa bestående lagring"
+
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
 msgstr "\"Uthållighet\" är avaktiverat för bitcoin-klienten Electrum"
@@ -75,15 +99,31 @@ msgid "Do you want to start Electrum anyway?"
 msgstr "Vill du starta Electrum ändå?"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:63
+#: config/chroot_local-includes/usr/local/bin/liferea:33
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Starta"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:64
+#: config/chroot_local-includes/usr/local/bin/liferea:32
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Avsluta"
 
+#: config/chroot_local-includes/usr/local/bin/liferea:18
+msgid "Liferea is deprecated"
+msgstr "Liferea är inaktuell"
+
+#: config/chroot_local-includes/usr/local/bin/liferea:19
+msgid "Do you wish to start Liferea anyway?"
+msgstr "Vill du starta Liferea ändå?"
+
+#: config/chroot_local-includes/usr/local/bin/liferea:21
+msgid ""
+"Due to security concerns the Liferea feed reader will be removed from Tails "
+"by the end of 2018. Please migrate your feeds to Thunderbird."
+msgstr "På grund av säkerhetshänsyn kommer Liferea flödesläsaren att tas 
bort från Tails i slutet av 2018. Vänligen migrera dina flöden till 
Thunderbird."
+
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "Starta om"
@@ -121,50 +161,213 @@ msgstr "Build information:\n%s"
 msgid "not available"
 msgstr "ej tillgängligt"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:170
-msgid "Your additional software installation failed"
-msgstr "Installationen av din tillvalda mjukvara misslyckades"
+#. Translators: Don't translate {details}, it's a placeholder and will
+#. be replaced.
+#: 

[tor-commits] [translation/whisperback] Update translations for whisperback

2018-11-07 Thread translation
commit 5784a466bc22a1fda7fae172d1ecc1a27cc6d7f7
Author: Translation commit bot 
Date:   Wed Nov 7 09:19:26 2018 +

Update translations for whisperback
---
 sv/sv.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index aa0bcd192..8ab00cb40 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-11 17:17+0200\n"
-"PO-Revision-Date: 2018-11-07 07:29+\n"
+"PO-Revision-Date: 2018-11-07 09:09+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -136,7 +136,7 @@ msgstr "Skicka återkoppling som krypterad e-post."
 
 #: ../whisperBack/gui.py:336
 msgid "Copyright © 2009-2018 Tails developers (ta...@boum.org)"
-msgstr ""
+msgstr "Copyright © 2009-2018 Tails developers (ta...@boum.org)"
 
 #: ../whisperBack/gui.py:337
 msgid "Tails developers "

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

2018-11-07 Thread translation
commit 32d600c72245d2d6a6908fc54b07c0b17c007e1f
Author: Translation commit bot 
Date:   Wed Nov 7 09:18:46 2018 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 sv/abouttbupdate.dtd | 4 
 1 file changed, 4 insertions(+)

diff --git a/sv/abouttbupdate.dtd b/sv/abouttbupdate.dtd
index da02c4984..7b7572800 100644
--- a/sv/abouttbupdate.dtd
+++ b/sv/abouttbupdate.dtd
@@ -4,3 +4,7 @@
 
 
 
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2018-11-07 Thread translation
commit fccfc12bbab707c45070aae2d3c8fa1cb0a9489b
Author: Translation commit bot 
Date:   Wed Nov 7 09:18:52 2018 +

Update translations for torbutton-browseronboardingproperties
---
 sv/browserOnboarding.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sv/browserOnboarding.properties b/sv/browserOnboarding.properties
index dc07443c9..fe0df319d 100644
--- a/sv/browserOnboarding.properties
+++ b/sv/browserOnboarding.properties
@@ -15,11 +15,11 @@ onboarding.tour-tor-privacy.button=Go to Tor-nätverk
 onboarding.tour-tor-network=Tor-nätverk
 onboarding.tour-tor-network.title=Res ett decentraliserat nätverk.
 onboarding.tour-tor-network.description=Tor Browser ansluter dig till 
Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till 
skillnad från en VPN, det finns ingen punkt av misslyckande eller 
centraliserad enhet du behöver lita på för att njuta av internet privat.
-onboarding.tour-tor-network.button=Gå till kretsskärmen
+onboarding.tour-tor-network.button=GÃ¥ till kretsvisning
 
-onboarding.tour-tor-circuit-display=Kretsskärm
+onboarding.tour-tor-circuit-display=Kretsvisning
 onboarding.tour-tor-circuit-display.title=Se din väg.
-onboarding.tour-tor-circuit-display.description=För varje domän du besöker 
förmedlas din trafik och krypteras i en krets över tre tor-reläer runt om i 
världen. Ingen webbplats vet var du ansluter från. Du kan begära en ny krets 
genom att klicka på "ny krets för denna webbplats" på vår kretsskärm.
+onboarding.tour-tor-circuit-display.description=För varje domän du besöker 
förmedlas din trafik och krypteras i en krets över tre tor-reläer runt om i 
världen. Ingen webbplats vet var du ansluter från. Du kan begära en ny krets 
genom att klicka på "ny krets för denna webbplats" på vår kretsvisning.
 onboarding.tour-tor-circuit-display.button=Se Min väg
 
 onboarding.tour-tor-security=Säkerhet
@@ -47,7 +47,7 @@ onboarding.tor-circuit-display.three-of-three=3 av 3
 onboarding.tor-circuit-display.intro.title=Hur fungerar kretsar?
 onboarding.tor-circuit-display.intro.msg=Kretsar består av slumpmässigt 
tilldelade reläer, som är datorer runt om i världen konfigurerade för att 
vidarebefordra Tor-trafik. Kretsar kan du bläddra privat och ansluta till 
onion-tjänster.
 
-onboarding.tor-circuit-display.diagram.title=Kretsskärm
+onboarding.tor-circuit-display.diagram.title=Kretsvisning
 onboarding.tor-circuit-display.diagram.msg=Detta diagram visar reläer som 
utgör kretsen för denna webbplats. För att förhindra länkning av aktivitet 
över olika platser, varje webbplats får en annan krets.
 
 onboarding.tor-circuit-display.new-circuit.title=Behöver du en ny krets?

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2018-11-07 Thread translation
commit d1e7afe1db63cb04db2c6355e35f7938b5157e3c
Author: Translation commit bot 
Date:   Wed Nov 7 09:18:41 2018 +

Update translations for torbutton-abouttbupdatedtd
---
 sv/abouttbupdate.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/abouttbupdate.dtd b/sv/abouttbupdate.dtd
index fda623e1a..7b7572800 100644
--- a/sv/abouttbupdate.dtd
+++ b/sv/abouttbupdate.dtd
@@ -5,6 +5,6 @@
 
 
 
-
-
+
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-11-07 Thread translation
commit 7b27bcd62e35793a3bc05efaa58145709967532d
Author: Translation commit bot 
Date:   Wed Nov 7 09:17:47 2018 +

Update translations for tor-browser-manual
---
 id/id.po | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/id/id.po b/id/id.po
index cf02b8a81..7dbdd210e 100644
--- a/id/id.po
+++ b/id/id.po
@@ -12,13 +12,14 @@
 # Dinar Lubis , 2017
 # Robert Dafis , 2018
 # ical, 2018
+# Emma Peel, 2018
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2018-09-07 16:48-0500\n"
 "PO-Revision-Date: 2016-12-07 01:01+\n"
-"Last-Translator: ical, 2018\n"
+"Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -352,6 +353,9 @@ msgid ""
 " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-"
 "azure and Snowflake."
 msgstr ""
+"Jika anda mencoba mengelak dari koneksi yang diblokir untuk pertama kali, "
+"anda perlu mencoba angkutan yang berbeda: obfs3, obfs4, ScrambeSuit, fte, "
+"meek-azure, Snowflake."
 
 #: circumvention.page:72
 msgid ""
@@ -406,6 +410,9 @@ msgid ""
 "the latest version of Tor Browser, hosted at a variety of locations, such as"
 " Dropbox, Google Drive and GitHub."
 msgstr ""
+"GetTor adalah sebuah servise yang secara otomatis menjawab pesan dengan "
+"tautan pada versi terakhir dari TorBrowser, penerima diberbagai lokasi, "
+"seperti Dropbox, Google Drive dan GitHub.."
 
 #: downloading.page:33
 msgid "To use GetTor via email:"
@@ -453,7 +460,7 @@ msgstr ""
 
 #: downloading.page:69
 msgid "To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.):"
-msgstr ""
+msgstr "Untuk menggunakan GetTor melalui Jabber/XMPP (Jitsi, CoyIM):"
 
 #: downloading.page:74
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-11-07 Thread translation
commit 153e8ef05bfa08a9cbc35f3ad7289415af79f106
Author: Translation commit bot 
Date:   Wed Nov 7 09:17:02 2018 +

Update translations for tails-persistence-setup
---
 sv/sv.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 5a7c96839..305713410 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-11-01 12:21+0100\n"
-"PO-Revision-Date: 2018-11-07 08:45+\n"
+"PO-Revision-Date: 2018-11-07 08:52+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr "Enhet %s innehåller ingen partition för bestående 
lagring."
 msgid ""
 "Cannot delete the persistent volume on %s while in use. You should restart "
 "Tails without persistence."
-msgstr "Det går inte att ta bort den beständiga volymen på %s när den 
används. Du bör starta om Tails utan bestående."
+msgstr "Det går inte att ta bort den beständiga volymen på %s när den 
används. Du bör starta om Tails utan bestånd."
 
 #: ../lib/Tails/Persistence/Setup.pm:407
 #, perl-format
@@ -118,7 +118,7 @@ msgstr "Behåll filer lagrade i katalogen `Persistent'"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:71
 msgid "Browser Bookmarks"
-msgstr ""
+msgstr "Webbläsarens bokmärken"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:73
 msgid "Bookmarks saved in the Tor Browser"
@@ -134,11 +134,11 @@ msgstr "Konfiguration av nätverksenheter och 
anslutningar"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:101
 msgid "Additional Software"
-msgstr ""
+msgstr "Ytterligare programvara"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:103
 msgid "Software installed when starting Tails"
-msgstr ""
+msgstr "Programvara installerad när du startar Tails"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:121
 msgid "Printers"
@@ -154,7 +154,7 @@ msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid "Thunderbird emails, feeds, and settings"
-msgstr ""
+msgstr "Thunderbird e-post, flöden och inställningar"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:151
 msgid "GnuPG"
@@ -166,7 +166,7 @@ msgstr "GnuPG nyckelringar och konfiguration"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:166
 msgid "Bitcoin Client"
-msgstr ""
+msgstr "Bitcoin-klient"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:168
 msgid "Electrum's bitcoin wallet and configuration"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-11-07 Thread translation
commit 4175fa15fb4b52cb97d30998212c1aca055b7512
Author: Translation commit bot 
Date:   Wed Nov 7 09:16:09 2018 +

Update translations for tails-misc
---
 sv.po | 50 +-
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/sv.po b/sv.po
index 9f4c62d86..1274e82b0 100644
--- a/sv.po
+++ b/sv.po
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-31 16:04+0100\n"
-"PO-Revision-Date: 2018-11-07 07:31+\n"
+"PO-Revision-Date: 2018-11-07 09:16+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -63,13 +63,13 @@ msgstr "Hjälp oss att fixa ditt fel!\nLäs våra ins
 msgid ""
 "You can install additional software automatically from your persistent "
 "storage when starting Tails."
-msgstr ""
+msgstr "Du kan installera extra program automatiskt från din kvarhållande 
lagring när du startar Tails."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
 msgid ""
 "The following software is installed automatically from your persistent "
 "storage when starting Tails."
-msgstr ""
+msgstr "Följande program installeras automatiskt från din kvarhållande 
lagring när Tails startas."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:172
@@ -77,11 +77,11 @@ msgid ""
 "To add more, install some software using Synaptic Package Manager or APT on the command line."
-msgstr ""
+msgstr "För att lägga till mer, installera lite program med Synaptic pakethanterare eller APT på kommandoraden."
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151
 msgid "_Create persistent storage"
-msgstr ""
+msgstr "_Skapa kvarhållande lagring"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
@@ -168,13 +168,13 @@ msgstr "ej tillgängligt"
 msgid ""
 "{details} Please check your list of additional software or read the system "
 "log to understand the problem."
-msgstr ""
+msgstr "{details} Kontrollera din lista över extra program eller läs 
systemloggen för att förstå problemet."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152
 msgid ""
 "Please check your list of additional software or read the system log to "
 "understand the problem."
-msgstr ""
+msgstr "Kontrollera din lista över extra program eller läs systemloggen för 
att förstå problemet."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156
 msgid "Show Log"
@@ -201,34 +201,34 @@ msgstr ", "
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319
 #, python-brace-format
 msgid "Add {packages} to your additional software?"
-msgstr ""
+msgstr "Lägg {packages} till dina extra program?"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291
 msgid ""
 "To install it automatically from your persistent storage when starting "
 "Tails."
-msgstr ""
+msgstr "För att installera det automatiskt från din bestående lagring när 
du Tails startas."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293
 msgid "Install Every Time"
-msgstr ""
+msgstr "Installera varje gång"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325
 msgid "Install Only Once"
-msgstr ""
+msgstr "Installera endast en gång"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371
 msgid "The configuration of your additional software failed."
-msgstr ""
+msgstr "Konfigurationen av extra programvara misslyckades."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321
 msgid ""
 "To install it automatically when starting Tails, you can create a persistent"
 " storage and activate the Additional Software feature."
-msgstr ""
+msgstr "För att installera det automatiskt när du startar Tails kan du skapa 
en bestående lagring och aktivera Extra program-funktionen."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324
 msgid "Create Persistent Storage"
@@ -256,7 +256,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359
 #, python-brace-format
 msgid "Remove {packages} from your additional software?"
-msgstr ""
+msgstr "Ta bort {packages} från dina extra program?"
 
 #. Translators: Don't translate {packages}, it's a placeholder
 #. and will be replaced.
@@ -277,7 +277,7 @@ msgstr "Avbryt"
 
 #: 

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-11-07 Thread translation
commit ebe57a57f390e85a383a2918a9b23a3d43bc6155
Author: Translation commit bot 
Date:   Wed Nov 7 08:46:48 2018 +

Update translations for tails-persistence-setup
---
 sv/sv.po | 39 ---
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 53bfb59d3..5a7c96839 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -7,6 +7,7 @@
 # Anders Nilsson , 2015
 # Filip Nyquist , 2015
 # Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018
 # miccav, 2014
 # phst, 2014
 # leveebreaks, 2014
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-10-04 00:51+\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2018-11-01 12:21+0100\n"
+"PO-Revision-Date: 2018-11-07 08:45+\n"
+"Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +55,7 @@ msgstr "Enhet %s innehåller ingen partition för bestående 
lagring."
 msgid ""
 "Cannot delete the persistent volume on %s while in use. You should restart "
 "Tails without persistence."
-msgstr ""
+msgstr "Det går inte att ta bort den beständiga volymen på %s när den 
används. Du bör starta om Tails utan bestående."
 
 #: ../lib/Tails/Persistence/Setup.pm:407
 #, perl-format
@@ -216,65 +217,65 @@ msgstr "En %s partition för bestående lagring kommer 
att skapas på enheten Beware! Using persistence has consequences that must be well "
 "understood. Tails can't help you if you use it wrong! See the Encrypted "
 "persistence page of the Tails documentation to learn more."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:169
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:170
 msgid "Passphrase:"
 msgstr "Lösenord:"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:177
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:178
 msgid "Verify Passphrase:"
 msgstr "Upprepa lösenord:"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:188
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:244
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:189
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:245
 msgid "Passphrase can't be empty"
 msgstr "Lösenordet får inte vara tomt"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:235
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:236
 msgid "Passphrases do not match"
 msgstr "Lösenorden matchar inte"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:284
 #: ../lib/Tails/Persistence/Step/Delete.pm:103
 #: ../lib/Tails/Persistence/Step/Configure.pm:181
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:291
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:292
 msgid "Mounting Tails persistence partition."
 msgstr "Monterar Tails-partition med bestående lagring."
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:294
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295
 msgid "The Tails persistence partition will be mounted."
 msgstr "Tails partition med bestående lagring kommer att monteras."
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:303
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304
 msgid "Correcting permissions of the persistent volume."
 msgstr "Rättar till behörigheterna på den bestående lagringen."
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:306
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307
 msgid "The permissions of the persistent volume will be corrected."
 msgstr "Behörigheterna på den bestående lagringen kommer att rättas till."
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:314
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:315
 msgid "Creating default persistence configuration."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:317
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:318
 msgid "The default persistence configuration will be created."
 msgstr ""
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:332
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:333
 msgid "Creating..."
 msgstr "Skapar..."
 
-#: ../lib/Tails/Persistence/Step/Bootstrap.pm:335
+#: ../lib/Tails/Persistence/Step/Bootstrap.pm:336
 msgid "Creating the persistent volume..."
 msgstr "Skapar partition för bestående lagring..."
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits