[tor-commits] [stem/master] Format interpreter lines individually

2016-07-30 Thread atagar 
commit 7553e1e9d25c93de31981180800c3a1edea01aa4
Author: Damian Johnson 
Date:   Sat Jul 30 10:47:35 2016 -0700

Format interpreter lines individually

Applying terminal formatting to each line of the tor output individually 
rather
than the whole multi-line message. This doesn't matter for our interpreter, 
but
makes the output much easier for nyx to work with.
---
 docs/change_log.rst   |  1 +
 stem/interpreter/__init__.py  | 10 +-
 stem/util/term.py | 12 +++-
 test/unit/interpreter/commands.py |  5 +++--
 test/unit/util/term.py|  2 ++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 839c7c9..4857b04 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -92,6 +92,7 @@ The following are only available within Stem's `git repository
   * Additional information when :func:`~stem.util.system.call` fails through a 
:class:`~stem.util.system.CallError`
   * Added **stem.util.system.SYSTEM_CALL_TIME** with the total time spent on 
system calls
   * Added an **is_ipv6** value to :class:`~stem.util.connection.Connection` 
instances
+  * Added LINES attribute to :data:`~stem.util.term.Attr`
   * Added :func:`~stem.util.system.pids_by_user`
   * Added :func:`~stem.util.connection.address_to_int`
   * Added :func:`~stem.util.term.encoding`
diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py
index 0b24894..5031900 100644
--- a/stem/interpreter/__init__.py
+++ b/stem/interpreter/__init__.py
@@ -28,11 +28,11 @@ __all__ = [
 
 PROMPT = format('>>> ', Color.GREEN, Attr.BOLD, Attr.READLINE_ESCAPE)
 
-STANDARD_OUTPUT = (Color.BLUE, )
-BOLD_OUTPUT = (Color.BLUE, Attr.BOLD)
-HEADER_OUTPUT = (Color.GREEN, )
-HEADER_BOLD_OUTPUT = (Color.GREEN, Attr.BOLD)
-ERROR_OUTPUT = (Attr.BOLD, Color.RED)
+STANDARD_OUTPUT = (Color.BLUE, Attr.LINES)
+BOLD_OUTPUT = (Color.BLUE, Attr.BOLD, Attr.LINES)
+HEADER_OUTPUT = (Color.GREEN, Attr.LINES)
+HEADER_BOLD_OUTPUT = (Color.GREEN, Attr.BOLD, Attr.LINES)
+ERROR_OUTPUT = (Attr.BOLD, Color.RED, Attr.LINES)
 
 settings_path = os.path.join(os.path.dirname(__file__), 'settings.cfg')
 uses_settings = stem.util.conf.uses_settings('stem_interpreter', settings_path)
diff --git a/stem/util/term.py b/stem/util/term.py
index a32fe93..1940b9e 100644
--- a/stem/util/term.py
+++ b/stem/util/term.py
@@ -33,6 +33,9 @@ Utilities for working with the terminal.
 
   Terminal text attributes.
 
+  .. versionchanged:: 1.5.0
+ Added the LINES attribute.
+
   === ===
   AttrDescription
   === ===
@@ -40,6 +43,7 @@ Utilities for working with the terminal.
   **HIGHLIGHT**   inverted foreground and background
   **UNDERLINE**   underlined text
   **READLINE_ESCAPE** wrap encodings in `RL_PROMPT_START_IGNORE and 
RL_PROMPT_END_IGNORE sequences 
`_
+  **LINES**   formats lines individually
   === ===
 """
 
@@ -55,7 +59,7 @@ DISABLE_COLOR_SUPPORT = False
 
 Color = stem.util.enum.Enum(*TERM_COLORS)
 BgColor = stem.util.enum.Enum(*['BG_' + color for color in TERM_COLORS])
-Attr = stem.util.enum.Enum('BOLD', 'UNDERLINE', 'HIGHLIGHT', 'READLINE_ESCAPE')
+Attr = stem.util.enum.Enum('BOLD', 'UNDERLINE', 'HIGHLIGHT', 
'READLINE_ESCAPE', 'LINES')
 
 # mappings of terminal attribute enums to their ANSI escape encoding
 FG_ENCODING = dict([(list(Color)[i], str(30 + i)) for i in range(8)])
@@ -123,6 +127,12 @@ def format(msg, *attr):
   if DISABLE_COLOR_SUPPORT:
 return msg
 
+  if Attr.LINES in attr:
+attr = list(attr)
+attr.remove(Attr.LINES)
+lines = [format(line, *attr) for line in msg.split('\n')]
+return '\n'.join(lines)
+
   # if we have reset sequences in the message then apply our attributes
   # after each of them
 
diff --git a/test/unit/interpreter/commands.py 
b/test/unit/interpreter/commands.py
index 30407ba..1fe52f7 100644
--- a/test/unit/interpreter/commands.py
+++ b/test/unit/interpreter/commands.py
@@ -174,7 +174,8 @@ class TestInterpretorCommands(unittest.TestCase):
 
 interpreter = ControlInterpretor(controller)
 
-self.assertEqual('\x1b[34m%s\x1b[0m\n' % response, 
interpreter.run_command('GETINFO version'))
+self.assertEqual('\x1b[34m250-version=0.2.5.1-alpha-dev 
(git-245ecfff36c0cecc)\r\x1b[0m\n\x1b[34m250 OK\x1b[0m\n', 
interpreter.run_command('GETINFO version'))
+self.assertEqual('\x1b[34m250-version=0.2.5.1-alpha-dev 
(git-245ecfff36c0cecc)\r\x1b[0m\n\x1b[34m250 OK\x1b[0m\n', 
interpreter.run_command('GETINFO version'))
 controller.msg.assert_called_with('GETINFO version')
 
 controller.msg.side_effect = stem.ControllerError('kaboom!')
@@ -188,7 +189,7 @@ class TestInterpretorCommands(unittest.TestCase):
 
 interpreter =

[tor-commits] [tor-browser-bundle/master] Update Chaneglog and tor-browser version

2016-07-30 Thread gk 
commit 8eca2970d9b1b3b4d071f4cb837e16d7637e83b9
Author: Georg Koppen 
Date:   Sat Jul 30 11:56:37 2016 +

Update Chaneglog and tor-browser version
---
 Bundle-Data/Docs/ChangeLog.txt | 2 ++
 gitian/versions.alpha  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 0f089ec..eb79991 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -26,8 +26,10 @@ Tor Browser 6.5a2 -- August 3
* Bug 19735: Switch default search engine to DuckDuckGo
  * Windows
* Bug 19348: Adapt to more than one build target on Windows (fixes updates)
+   * Bug 19725: Remove old updater files left on disk after upgrade to 6.x
  * Linux
* Bug 19276: Disable Xrender due to possible performance regressions
+   * Bug 19725: Remove old updater files left on disk after upgrade to 6.x
  * OS X
* Bug 19269: Icon doesn't appear in Applications folder or Dock
  * Android
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 031a839..4be792f 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -14,7 +14,7 @@ FIREFOX_VERSION=45.3.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2
 TOR_TAG=tor-0.2.8.5-rc
 TORLAUNCHER_TAG=0.2.9.3
 TORBUTTON_TAG=1.9.6.1

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

[tor-commits] [tor-browser/tor-browser-45.3.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

2016-07-30 Thread gk 
commit e0f6ebcc0f63602d59bb1b954029d1950a3e58a5
Author: Kathy Brade 
Date:   Tue Jul 26 10:40:24 2016 -0400

fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

When updating from an earlier version to Tor Browser 6.0 or later, old
update info files are left behind on Linux and Windows. Remove them.
This fixes bug 19725.
---
 toolkit/mozapps/update/nsUpdateService.js | 40 +++
 1 file changed, 40 insertions(+)

diff --git a/toolkit/mozapps/update/nsUpdateService.js 
b/toolkit/mozapps/update/nsUpdateService.js
index 4495210..b9b91fc 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -1946,6 +1946,10 @@ UpdateService.prototype = {
* notify the user of install success.
*/
   _postUpdateProcessing: function AUS__postUpdateProcessing() {
+#if defined(TOR_BROWSER_UPDATE) && !defined(XP_MACOSX)
+this._removeOrphanedTorBrowserFiles();
+#endif
+
 if (!this.canCheckForUpdates) {
   LOG("UpdateService:_postUpdateProcessing - unable to check for " +
   "updates... returning early");
@@ -2113,6 +2117,42 @@ UpdateService.prototype = {
 cleanUpMozUpdaterDirs();
   },
 
+#if defined(TOR_BROWSER_UPDATE) && !defined(XP_MACOSX)
+  /**
+   * When updating from an earlier version to Tor Browser 6.0 or later, old
+   * update info files are left behind on Linux and Windows. Remove them.
+   */
+  _removeOrphanedTorBrowserFiles: function 
AUS__removeOrphanedTorBrowserFiles() {
+try {
+  let oldUpdateInfoDir = getAppBaseDir();  // aka the Browser directory.
+
+#ifdef XP_WIN
+  // On Windows, the updater files were stored under
+  // Browser/TorBrowser/Data/Browser/Caches/firefox/
+  oldUpdateInfoDir.appendRelativePath(
+"TorBrowser\\Data\\Browser\\Caches\\firefox");
+#endif
+
+  // Remove the updates directory.
+  let updatesDir = oldUpdateInfoDir.clone();
+  updatesDir.append("updates");
+  if (updatesDir.exists() && updatesDir.isDirectory()) {
+updatesDir.remove(true);
+  }
+
+  // Remove files: active-update.xml and updates.xml
+  let filesToRemove = [ "active-update.xml", "updates.xml" ];
+  filesToRemove.forEach(function(aFileName) {
+let f = oldUpdateInfoDir.clone();
+f.append(aFileName);
+if (f.exists()) {
+  f.remove(false);
+}
+  });
+} catch (e) {}
+  },
+#endif
+
   /**
* Register an observer when the network comes online, so we can 
short-circuit
* the app.update.interval when there isn't connectivity

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

[tor-commits] [tor-browser-bundle/hardened-builds] Bug 19703: Upgrade Go to 1.6.3.

2016-07-30 Thread gk 
commit 645f3ea6c81aef0b8d1ef25ae2d9ebe30d7669a6
Author: David Fifield 
Date:   Thu Jul 21 16:15:19 2016 -0700

Bug 19703: Upgrade Go to 1.6.3.
---
 gitian/versions | 4 ++--
 gitian/versions.alpha   | 4 ++--
 gitian/versions.beta| 4 ++--
 gitian/versions.nightly | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index d45eca0..22b52ff 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -58,7 +58,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see 
https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.6.2
+GO_VER=1.6.3
 NSIS_VER=2.51
 
 ## File names for the source packages
@@ -110,7 +110,7 @@ 
PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc
+GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00
 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7
 
NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a
 GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 81f8a47..29595cc 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -66,7 +66,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see 
https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.6.2
+GO_VER=1.6.3
 NSIS_VER=2.51
 
 ## File names for the source packages
@@ -118,7 +118,7 @@ 
PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc
+GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00
 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7
 
NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a
 GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 7a305a1..92761a4 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -51,7 +51,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see 
https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.6.2
+GO_VER=1.6.3
 
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
@@ -102,7 +102,7 @@ 
PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc
+GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00
 
STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8
 
NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5
 
NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index c6dad5b..dead59c 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -70,7 +70,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see 
https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.6.2
+GO_VER=1.6.3
 NSIS_VER=2.51
 ELFUTILS_VER=0.160
 
@@ -124,7 +124,7 @@ 
PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc
+GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00
 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7
 
NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a
 GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad

___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [tor-browser-bundle/master] Bug 19703: Upgrade Go to 1.6.3.

2016-07-30 Thread gk 
commit 1aa712a555e0ec9ff7a121f2d7429b4783bcf2ad
Author: David Fifield 
Date:   Thu Jul 21 16:15:19 2016 -0700

Bug 19703: Upgrade Go to 1.6.3.
---
 gitian/versions | 4 ++--
 gitian/versions.alpha   | 4 ++--
 gitian/versions.beta| 4 ++--
 gitian/versions.nightly | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 96e684a..c3fdb32 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -62,7 +62,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see 
https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.6.2
+GO_VER=1.6.3
 NSIS_VER=2.51
 
 ## File names for the source packages
@@ -114,7 +114,7 @@ 
PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc
+GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00
 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7
 
NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a
 GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 14b68dc..031a839 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -62,7 +62,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see 
https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.6.2
+GO_VER=1.6.3
 NSIS_VER=2.51
 
 ## File names for the source packages
@@ -114,7 +114,7 @@ 
PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc
+GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00
 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7
 
NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a
 GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 3a1d893..89003ff 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -49,7 +49,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see 
https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.6.2
+GO_VER=1.6.3
 
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
@@ -96,7 +96,7 @@ 
PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc
+GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00
 
STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8
 
NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5
 
NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 88394c6..7d66421 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -69,7 +69,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see 
https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.6.2
+GO_VER=1.6.3
 NSIS_VER=2.51
 
 ## File names for the source packages
@@ -121,7 +121,7 @@ 
PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 
SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc
+GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00
 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7
 
NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a
 GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad



___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [tor-browser-bundle/master] Update Changelog (for Go update)

2016-07-30 Thread gk 
commit 081e1be4fe08bce70a1a2874e7832493c5360f20
Author: Georg Koppen 
Date:   Sat Jul 30 11:45:39 2016 +

Update Changelog (for Go update)
---
 Bundle-Data/Docs/ChangeLog.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 264f839..0f089ec 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -32,6 +32,9 @@ Tor Browser 6.5a2 -- August 3
* Bug 19269: Icon doesn't appear in Applications folder or Dock
  * Android
* Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined
+ * Build System
+   * All Platforms
+ * Bug 19703: Upgrade Go to 1.6.3
 
 Tor Browser 6.0.2 -- June 21
  * All Platforms

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

[tor-commits] [tor-browser-bundle/master] Release preparations for 6.5a2

2016-07-30 Thread gk 
commit 14379e81b51d6aecf3b27c20c471990f4a1dc08f
Author: Georg Koppen 
Date:   Sat Jul 30 11:15:10 2016 +

Release preparations for 6.5a2

Version bumps; changelog update; config.yml update
---
 Bundle-Data/Docs/ChangeLog.txt| 35 +++
 gitian/versions.alpha | 14 +++---
 tools/update-responses/config.yml | 12 ++--
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index ae5529d..264f839 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,38 @@
+Tor Browser 6.5a2 -- August 3
+ * All Platforms
+   * Update Firefox to 45.3.0esr
+   * Update Tor to tor-0.2.8.5-rc
+   * Update Torbutton to 1.9.6.1
+ * Bug 19689: Use proper parent window for plugin prompt
+ * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor 
client
+ * Bug 19417: Disable asm.js (but add code to clear on New Identity if 
enabled)
+ * Bug 19273: Improve external app launch handling and associated warnings
+ * Bug 8725: Block addon resource and url fingerprinting with 
nsIContentPolicy
+   * Update HTTPS-Everywhere to 5.2.1
+   * Update NoScript to 2.9.0.12
+   * Bug 19417: Disable asmjs for now
+   * Bug 19715: Disable the meek-google pluggable transport option
+   * Bug 19714: Remove mercurius4 obfs4 bridge
+   * Bug 19585: Fix regression test for keyboard layout fingerprinting
+   * Bug 19515: Tor Browser is crashing in graphics code
+   * Bug 18513: Favicon requests can bypass New Identity
+   * Bug 19273: Write C++ patch for external app launch handling
+   * Bug 16998: Isolate preconnect requests to URL bar domain
+   * Bug 18923: Add script to run all Tor Browser regression tests
+   * Bug 19478: Prevent millisecond resolution leaks in File API
+   * Bug 19401: Fix broken PDF download button
+   * Bug 19411: Don't show update icon if a partial update failed
+   * Bug 19400: Back out GCC bug workaround to avoid asmjs crash
+   * Bug 19735: Switch default search engine to DuckDuckGo
+ * Windows
+   * Bug 19348: Adapt to more than one build target on Windows (fixes updates)
+ * Linux
+   * Bug 19276: Disable Xrender due to possible performance regressions
+ * OS X
+   * Bug 19269: Icon doesn't appear in Applications folder or Dock
+ * Android
+   * Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined
+
 Tor Browser 6.0.2 -- June 21
  * All Platforms
* Update Torbutton to 1.9.5.5
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 39b3c98..14b68dc 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=45.2.0esr
+FIREFOX_VERSION=45.3.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1
-TOR_TAG=tor-0.2.8.3-alpha
+TOR_TAG=tor-0.2.8.5-rc
 TORLAUNCHER_TAG=0.2.9.3
-TORBUTTON_TAG=1.9.6
-HTTPSE_TAG=5.1.9
+TORBUTTON_TAG=1.9.6.1
+HTTPSE_TAG=5.2.1
 NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
@@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1
 OPENSSL_VER=1.0.1t
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build2
+FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.24
 GCC_VER=5.1.0
 CLANG_VER=r247539
@@ -68,7 +68,7 @@ NSIS_VER=2.51
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 CCTOOLS_PACKAGE=cctools.tar.gz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -102,7 +102,7 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 
OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390
+NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7
 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
diff --git a/tools/update-responses/config.yml 
b/tools/update-responses/config.yml
index 0425afc..7b92a72 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -12,7 +12,7 @@ build_targets:
 osx32: Darwin_x86-gcc3
 osx64: Darwin_x86_64-gcc3
 channels:
-alpha: 6.5a1
+alpha: 6.5a2
 release: 6.0.1
 versions:
 6.0.1:
@@ -27,12 +27,12 @@ versions:
 osx32:

[tor-commits] [tor-browser-bundle/master] Making the git-gpg-wrapper executable

2016-07-30 Thread gk 
commit 771b1ad79107ad15ea26c2b41da7267dc2e8fb56
Author: Georg Koppen 
Date:   Sat Jul 30 10:00:11 2016 +

Making the git-gpg-wrapper executable
---
 gitian/git-gpg-wrapper | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper
old mode 100644
new mode 100755

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

[tor-commits] [tor-browser-bundle/master] Update gk's key

2016-07-30 Thread gk 
commit 638d79fccb2e49ad871616e3cc339ff031df524c
Author: Georg Koppen 
Date:   Sat Jul 30 09:29:24 2016 +

Update gk's key
---
 gitian/gpg/gk.gpg| Bin 33866 -> 72418 bytes
 gitian/gpg/torbutton.gpg | Bin 55562 -> 94114 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg
index ad731ca..2f78b14 100644
Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ
diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg
index e4a03dd..da40f76 100644
Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ



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

[tor-commits] [tor-browser-bundle/master] Bug 19737: Allow git tag signatures made using an expired key

2016-07-30 Thread gk 
commit 7923b2184b46d4f9b861db256f28e00ee47d390d
Author: Nicolas Vigier 
Date:   Wed Jul 27 22:53:19 2016 +0200

Bug 19737: Allow git tag signatures made using an expired key

We are adding a gitian/git-gpg-wrapper script which validates signatures
made using an expired key. To do that, we use gpgv rather than gpg, and
any EXPKEYSIG line from the gpg `--status-fd` output is replaced by a
GOODSIG line.
---
 gitian/git-gpg-wrapper | 13 +
 gitian/verify-tags.sh  |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper
new file mode 100644
index 000..f137d6d
--- /dev/null
+++ b/gitian/git-gpg-wrapper
@@ -0,0 +1,13 @@
+#!/bin/bash
+# This wrapper script is used by git to verify signatures made using
+# an expired key.
+# https://bugs.torproject.org/19737
+set -e
+if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \
+&& [ "$2" = '--verify' ]
+then
+gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /'
+exit ${PIPESTATUS[0]}
+else
+exec gpg "$@"
+fi
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index 7d92e36..baea827 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -37,10 +37,11 @@ verify_git() {
 
   local gpghome=$(mktemp -d)
   echo "rm -rf '$gpghome'" >> "$CLEANUP"
-  GNUPGHOME="$gpghome" gpg --import "$keyring"
+  GNUPGHOME="$gpghome" gpg --no-default-keyring --keyring trustedkeys.gpg 
--import "$keyring"
 
   pushd .
   cd "$dir"
+  git config --local gpg.program "$WRAPPER_DIR/git-gpg-wrapper"
   if ! GNUPGHOME="$gpghome" git tag -v "$tag"; then
 echo >&2 "$dir: verification of tag $tag against $keyring failed!"
 exit 1



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

[tor-commits] [tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! fixup! Regression tests for "Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing"

2016-07-30 Thread gk 
commit 83f53ee4897f6047c0c691d86833c6960311768e
Author: Georg Koppen 
Date:   Sat Jul 30 10:36:40 2016 +

fixup! fixup! Regression tests for "Omnibox: Add DDG, Startpage, 
Disconnect, Youtube, Twitter; remove Amazon, eBay, bing"

Fixup typo.
---
 tbb-tests/browser_tor_omnibox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tbb-tests/browser_tor_omnibox.js b/tbb-tests/browser_tor_omnibox.js
index 082dd84..e18b2a8 100644
--- a/tbb-tests/browser_tor_omnibox.js
+++ b/tbb-tests/browser_tor_omnibox.js
@@ -8,7 +8,7 @@ function test() {
   engineIDs = browserSearchService.getEngines().map(e => e.identifier);
 
   // Check that we have the correct engines installed, in the right order.
-  is(engineIDs[0], "ddg", "Default search engine is disconnect");
+  is(engineIDs[0], "ddg", "Default search engine is duckduckgo");
   is(engineIDs[1], "youtube", "Secondary search engine is youtube");
   is(engineIDs[2], "google", "Google is third search engine");
 }

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

[tor-commits] [tor-browser-bundle/maint-6.0] Making the git-gpg-wrapper executable

2016-07-30 Thread gk 
commit 89a0db3a46be3c97b82c11fa85d66e97ee406971
Author: Georg Koppen 
Date:   Sat Jul 30 10:00:11 2016 +

Making the git-gpg-wrapper executable
---
 gitian/git-gpg-wrapper | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper
old mode 100644
new mode 100755

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

[tor-commits] [tor-browser-bundle/maint-6.0] Update gk's key

2016-07-30 Thread gk 
commit f40aa39010ca734f40e2888604d7a631aa31f5f5
Author: Georg Koppen 
Date:   Sat Jul 30 09:29:24 2016 +

Update gk's key
---
 gitian/gpg/gk.gpg| Bin 33866 -> 72418 bytes
 gitian/gpg/torbutton.gpg | Bin 55562 -> 94114 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg
index ad731ca..2f78b14 100644
Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ
diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg
index e4a03dd..da40f76 100644
Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

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

[tor-commits] [tor-browser-bundle/maint-6.0] Version bumps; Changelog update

2016-07-30 Thread gk 
commit 12dcde3326c98fea5bce7a017269492620cd11ca
Author: Georg Koppen 
Date:   Sat Jul 30 11:21:59 2016 +0200

Version bumps; Changelog update
---
 Bundle-Data/Docs/ChangeLog.txt |  1 +
 gitian/versions| 12 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 2abd47e..c4a255d 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -5,6 +5,7 @@ Tor Browser 6.0.3 -- August 2
  * Bug 19417: Disable asmjs for now
  * Bug 19689: Use proper parent window for plugin prompt
* Update HTTPS-Everywhere to 5.2.1
+   * Update NoScript to 2.9.0.12
* Bug 19417: Disable asmjs for now
* Bug 19715: Disable the meek-google pluggable transport option
* Bug 19714: Remove mercurius4 obfs4 bridge
diff --git a/gitian/versions b/gitian/versions
index c46c735..f6d8648 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -10,14 +10,14 @@ DATA_OUTSIDE_APP_DIR=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=45.2.0esr
+FIREFOX_VERSION=45.3.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1
 TOR_TAG=tor-0.2.7.6
 TORLAUNCHER_TAG=0.2.9.3
-TORBUTTON_TAG=1.9.5.5
+TORBUTTON_TAG=1.9.5.6
 HTTPSE_TAG=5.2.1
 NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
@@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1
 OPENSSL_VER=1.0.1t
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build2
+FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.24
 GCC_VER=5.1.0
 CLANG_VER=r247539
@@ -66,7 +66,7 @@ NSIS_VER=2.51
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 CCTOOLS_PACKAGE=cctools.tar.gz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -99,7 +99,7 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 
OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390
+NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7
 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

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

[tor-commits] [tor-browser-bundle/maint-6.0] Bug 19737: Allow git tag signatures made using an expired key

2016-07-30 Thread gk 
commit adcf907e1d54de5b9fcca736ca28b69d70c738fb
Author: Nicolas Vigier 
Date:   Wed Jul 27 22:53:19 2016 +0200

Bug 19737: Allow git tag signatures made using an expired key

We are adding a gitian/git-gpg-wrapper script which validates signatures
made using an expired key. To do that, we use gpgv rather than gpg, and
any EXPKEYSIG line from the gpg `--status-fd` output is replaced by a
GOODSIG line.
---
 gitian/git-gpg-wrapper | 13 +
 gitian/verify-tags.sh  |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper
new file mode 100644
index 000..f137d6d
--- /dev/null
+++ b/gitian/git-gpg-wrapper
@@ -0,0 +1,13 @@
+#!/bin/bash
+# This wrapper script is used by git to verify signatures made using
+# an expired key.
+# https://bugs.torproject.org/19737
+set -e
+if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \
+&& [ "$2" = '--verify' ]
+then
+gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /'
+exit ${PIPESTATUS[0]}
+else
+exec gpg "$@"
+fi
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index a966626..e006fb0 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -37,10 +37,11 @@ verify_git() {
 
   local gpghome=$(mktemp -d)
   echo "rm -rf '$gpghome'" >> "$CLEANUP"
-  GNUPGHOME="$gpghome" gpg --import "$keyring"
+  GNUPGHOME="$gpghome" gpg --no-default-keyring --keyring trustedkeys.gpg 
--import "$keyring"
 
   pushd .
   cd "$dir"
+  git config --local gpg.program "$WRAPPER_DIR/git-gpg-wrapper"
   if ! GNUPGHOME="$gpghome" git tag -v "$tag"; then
 echo >&2 "$dir: verification of tag $tag against $keyring failed!"
 exit 1

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

[tor-commits] [webwml/master] Fix Matt's name

2016-07-30 Thread sebastian 
commit bb2698fb1c902769f9118e1dfe4b7033db2e56e4
Author: Sebastian Hahn 
Date:   Sat Jul 30 08:13:15 2016 +0200

Fix Matt's name
---
 about/en/board.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index 0f8537a..932639d 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -14,7 +14,7 @@
 
   
 
-  Matth Blaze
+  Matt Blaze
   Board Chair
   
 Matt is a professor in the computer and information science

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