[tor-commits] [stem/master] Fix pids_by_user for FreeBSD

2017-09-03 Thread atagar 
commit f90ef8087d3bd0d95041272480e0554c113942f6
Author: Damian Johnson 
Date:   Sun Sep 3 14:39:50 2017 -0700

Fix pids_by_user for FreeBSD

Turns out FreeBSD uses an uppercase '-U' argument rather than '-u'...

  https://trac.torproject.org/projects/tor/ticket/23281#comment:7
---
 stem/util/system.py | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/stem/util/system.py b/stem/util/system.py
index 391c4b70..a563db45 100644
--- a/stem/util/system.py
+++ b/stem/util/system.py
@@ -129,7 +129,8 @@ GET_PID_BY_PORT_NETSTAT = 'netstat -npltu'
 GET_PID_BY_PORT_SOCKSTAT = 'sockstat -4l -P tcp -p %s'
 GET_PID_BY_PORT_LSOF = 'lsof -wnP -iTCP -sTCP:LISTEN'
 GET_PID_BY_FILE_LSOF = 'lsof -tw %s'
-GET_PIDS_BY_USER = 'ps -o pid -u %s'
+GET_PIDS_BY_USER_LINUX = 'ps -o pid -u %s'
+GET_PIDS_BY_USER_BSD = 'ps -o pid -U %s'
 GET_CWD_PWDX = 'pwdx %s'
 GET_CWD_LSOF = 'lsof -a -p %s -d cwd -Fn'
 GET_BSD_JAIL_ID_PS = 'ps -p %s -o jid'
@@ -861,7 +862,10 @@ def pids_by_user(user):
   # 915
 
   if is_available('ps'):
-results = call(GET_PIDS_BY_USER % user, None)
+if is_bsd():
+  results = call(GET_PIDS_BY_USER_BSD % user, None)
+else:
+  results = call(GET_PIDS_BY_USER_LINUX % user, None)
 
 if results:
   try:

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

[tor-commits] [stem/master] Drop '--encoding=ascii' from man command on FreeBSD

2017-09-03 Thread atagar 
commit fe1512cfd500135bb3e059a35cc4ecc0aeeb3ed1
Author: Damian Johnson 
Date:   Sun Sep 3 14:36:26 2017 -0700

Drop '--encoding=ascii' from man command on FreeBSD

We ran into issues with this argument on OSX. Turns out it's a no-go on 
FreeBSD
too...

  https://trac.torproject.org/projects/tor/ticket/23281#comment:7
---
 stem/manual.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stem/manual.py b/stem/manual.py
index 18a5d34d..6e4869cf 100644
--- a/stem/manual.py
+++ b/stem/manual.py
@@ -485,7 +485,7 @@ class Manual(object):
 :raises: **IOError** if unable to retrieve the manual
 """
 
-man_cmd = 'man %s -P cat %s' % ('' if stem.util.system.is_mac() else 
'--encoding=ascii', man_path)
+man_cmd = 'man %s -P cat %s' % ('' if (stem.util.system.is_mac() or 
stem.util.system.is_bsd()) else '--encoding=ascii', man_path)
 
 try:
   man_output = stem.util.system.call(man_cmd, env = {'MANWIDTH': 
'1000'})

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

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

2017-09-03 Thread translation 
commit 24327d098c9712af5b822a0ebb6ada36f7b12d74
Author: Translation commit bot 
Date:   Sun Sep 3 21:15:24 2017 +

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

diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index 062ed8104..3c5ab957f 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-06-26 13:30+\n"
+"PO-Revision-Date: 2017-09-03 20:46+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -112,7 +112,7 @@ msgstr "Sua mensagem foi enviada."
 
 #: ../whisperBack/gui.py:280
 msgid "An error occured during encryption."
-msgstr "Ocorreu um erro durante a encriptação."
+msgstr "Ocorreu um erro ao encriptar"
 
 #: ../whisperBack/gui.py:300
 #, python-format

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

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

2017-09-03 Thread translation 
commit 27f12f291e5cebdc9fca76e880ab129c45f77eb1
Author: Translation commit bot 
Date:   Sun Sep 3 21:15:19 2017 +

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

diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index 062ed8104..3c5ab957f 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-06-26 13:30+\n"
+"PO-Revision-Date: 2017-09-03 20:46+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -112,7 +112,7 @@ msgstr "Sua mensagem foi enviada."
 
 #: ../whisperBack/gui.py:280
 msgid "An error occured during encryption."
-msgstr "Ocorreu um erro durante a encriptação."
+msgstr "Ocorreu um erro ao encriptar"
 
 #: ../whisperBack/gui.py:300
 #, python-format

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

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2017-09-03 Thread translation 
commit 8458b94002dbbcb5b866437d7b2d223a6f908546
Author: Translation commit bot 
Date:   Sun Sep 3 20:48:50 2017 +

Update translations for tor-messenger-prefsdtd
---
 pt_BR/prefs.dtd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pt_BR/prefs.dtd b/pt_BR/prefs.dtd
index 06375099b..528ce9dd2 100644
--- a/pt_BR/prefs.dtd
+++ b/pt_BR/prefs.dtd
@@ -2,7 +2,8 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2017-09-03 Thread translation 
commit 956fdb15a1700b7f7a506f2b7f57aefacd7c091b
Author: Translation commit bot 
Date:   Sun Sep 3 20:48:54 2017 +

Update translations for tor-messenger-prefsdtd_completed
---
 pt_BR/prefs.dtd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pt_BR/prefs.dtd b/pt_BR/prefs.dtd
index 06375099b..528ce9dd2 100644
--- a/pt_BR/prefs.dtd
+++ b/pt_BR/prefs.dtd
@@ -2,7 +2,8 @@
 
 
 
-
+
 
 
 

___
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

2017-09-03 Thread translation 
commit 694c50fd84b52d0d337b4d74f5b1f284ae2fd36c
Author: Translation commit bot 
Date:   Sun Sep 3 20:46:40 2017 +

Update translations for tails-misc
---
 pt_BR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index ac917bf02..da43fbfd8 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -23,7 +23,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-05 11:57+0200\n"
-"PO-Revision-Date: 2017-06-26 14:19+\n"
+"PO-Revision-Date: 2017-09-03 20:38+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "O Tor está pronto"
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
-msgstr "Agora você pode acessar a Internet."
+msgstr "A partir de agora você pode acessar a Internet."
 
 #: config/chroot_local-includes/etc/whisperback/config.py:65
 #, python-format

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

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

2017-09-03 Thread translation 
commit a9f83143584a75176e9f172ba9fdd1c85d85ddc4
Author: Translation commit bot 
Date:   Sun Sep 3 20:46:45 2017 +

Update translations for tails-misc_completed
---
 pt_BR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index ac917bf02..da43fbfd8 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -23,7 +23,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-05 11:57+0200\n"
-"PO-Revision-Date: 2017-06-26 14:19+\n"
+"PO-Revision-Date: 2017-09-03 20:38+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "O Tor está pronto"
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
-msgstr "Agora você pode acessar a Internet."
+msgstr "A partir de agora você pode acessar a Internet."
 
 #: config/chroot_local-includes/etc/whisperback/config.py:65
 #, python-format

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

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

2017-09-03 Thread translation 
commit fe9378e93f6d028c62c6c0b85c9a935334b67b8b
Author: Translation commit bot 
Date:   Sun Sep 3 20:45:40 2017 +

Update translations for https_everywhere_completed
---
 pt_BR/ssl-observatory.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd
index 00d26aaeb..aab7372cd 100644
--- a/pt_BR/ssl-observatory.dtd
+++ b/pt_BR/ssl-observatory.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

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

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

2017-09-03 Thread translation 
commit a7bcd65eff6b8872a75cee5ff876114c05dfd99a
Author: Translation commit bot 
Date:   Sun Sep 3 20:45:31 2017 +

Update translations for https_everywhere
---
 pt_BR/ssl-observatory.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd
index 00d26aaeb..aab7372cd 100644
--- a/pt_BR/ssl-observatory.dtd
+++ b/pt_BR/ssl-observatory.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

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

[tor-commits] [metrics-web/master] Update to Java 8.

2017-09-03 Thread karsten 
commit 9c183f371cf94d6d01ec889a770939f218d30d6e
Author: Karsten Loesing 
Date:   Fri Sep 1 22:14:49 2017 +0200

Update to Java 8.

This change only changes the source and target version used in Ant
from 1.7 to 1.8 and doesn't make any further code changes. Those will
be contained in separate commits.

Implements #19620 and unbreaks #19730 which apparently contained some
changes related to the diamond operator that require Java 8. Oops.
---
 shared/build-base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/build-base.xml b/shared/build-base.xml
index 77e4fd1..d27757b 100644
--- a/shared/build-base.xml
+++ b/shared/build-base.xml
@@ -7,7 +7,7 @@
   
   
   
-  
+  
   
 
   

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

[tor-commits] [tor-messenger-build/master] Update changelog for f63b9804

2017-09-03 Thread sukhbir 
commit 64cb6cdbc2c5b1469741f8065dbab316cb3d41aa
Author: Sukhbir Singh 
Date:   Sun Sep 3 13:05:05 2017 -0400

Update changelog for f63b9804
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0781e84..d74ab16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ Tor Messenger 0.5.0b1 --
* Trac 22005: Move to ESR 52
* Trac 16606: Temporary XMPP accounts
* Trac 13855: Use known onions for XMPP servers
+ * Linux
+   * Trac 9: Compile Linux builds with Selfrando
  * Mac
* Trac 20316: Update OS X toolchain
* Trac 10942: Deterministic builds for Instantbird

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

[tor-commits] [tor-messenger-build/master] Compile Linux builds with Selfrando

2017-09-03 Thread sukhbir 
commit f63b980484f55bdf0bab86720587077b4474b679
Author: Sukhbir Singh 
Date:   Sun Sep 3 12:41:38 2017 -0400

Compile Linux builds with Selfrando

Changes borrowed from tor-browser-build.git
---
 keyring/elfutils.gpg| 1 +
 keyring/selfrando.gpg   | 1 +
 projects/elfutils   | 1 +
 projects/instantbird/build  | 8 
 projects/instantbird/config | 3 +++
 projects/selfrando  | 1 +
 tor-browser-build   | 2 +-
 7 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/keyring/elfutils.gpg b/keyring/elfutils.gpg
new file mode 12
index 000..6e82beb
--- /dev/null
+++ b/keyring/elfutils.gpg
@@ -0,0 +1 @@
+../tor-browser-build/keyring/elfutils.gpg
\ No newline at end of file
diff --git a/keyring/selfrando.gpg b/keyring/selfrando.gpg
new file mode 12
index 000..fee6b9c
--- /dev/null
+++ b/keyring/selfrando.gpg
@@ -0,0 +1 @@
+../tor-browser-build/keyring/selfrando.gpg
\ No newline at end of file
diff --git a/projects/elfutils b/projects/elfutils
new file mode 12
index 000..b4beda5
--- /dev/null
+++ b/projects/elfutils
@@ -0,0 +1 @@
+../tor-browser-build/projects/elfutils
\ No newline at end of file
diff --git a/projects/instantbird/build b/projects/instantbird/build
index 7813fe2..d9cbdb0 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -28,6 +28,14 @@ mkdir -p /var/tmp/build
   export PATH="/var/tmp/dist/binutils/bin:$PATH"
 [% END -%]
 
+[% IF c("var/linux") -%]
+  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %]
+  # Selfrando wrapper
+  export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH"
+  # We need to avoid the shuffling while building as this breaks compilation
+  export SELFRANDO_skip_shuffle=
+[% END -%]
+
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 
 [% IF c("var/osx") %]
diff --git a/projects/instantbird/config b/projects/instantbird/config
index ed09aa0..1d89837 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -83,6 +83,9 @@ input_files:
   - name: binutils
 project: binutils
 enable: '[% c("var/linux") %]'
+  - project: selfrando
+name: selfrando
+enable: '[% c("var/linux") %]'
   - project: gcc
 name: gcc
 enable: '[% c("var/windows") %]'
diff --git a/projects/selfrando b/projects/selfrando
new file mode 12
index 000..c7e52e1
--- /dev/null
+++ b/projects/selfrando
@@ -0,0 +1 @@
+../tor-browser-build/projects/selfrando/
\ No newline at end of file
diff --git a/tor-browser-build b/tor-browser-build
index 86210c6..da7485a 16
--- a/tor-browser-build
+++ b/tor-browser-build
@@ -1 +1 @@
-Subproject commit 86210c6821e393e98dd58c7d7bb6223755b496d5
+Subproject commit da7485a0b8f89b9ee2278d6132fc7bb53d5220e8

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