[tor-commits] [tor-messenger-build/master] Update Tor Launcher version and rebase patch

[sukhbir at torproject.org]

commit f38ed0e12e3d18f01fbd114b65dee433a59c1339
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Fri Jul 28 11:58:22 2017 -0400

    Update Tor Launcher version and rebase patch
---
 projects/tor-launcher/config                 |  2 +-
 projects/tor-launcher/controlport.patch.tmpl | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index f018c0b..2db0104 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.10.3
+version: 0.2.12.2
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: gk.gpg
diff --git a/projects/tor-launcher/controlport.patch.tmpl b/projects/tor-launcher/controlport.patch.tmpl
index cc5656b..973aadb 100644
--- a/projects/tor-launcher/controlport.patch.tmpl
+++ b/projects/tor-launcher/controlport.patch.tmpl
@@ -1,6 +1,6 @@
-From 08800fd6f225b05817e134fa465d1b83fb42be8e Mon Sep 17 00:00:00 2001
+From 4356de52ed7414df638bd523b730fba619a59303 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir at torproject.org>
-Date: Mon, 17 Nov 2014 22:50:47 +0530
+Date: Fri, 28 Jul 2017 11:22:13 -0400
 Subject: [PATCH 1/1] Set ControlPort to [% c("var/tor_control_port") %]
 
 ---
@@ -8,18 +8,18 @@ Subject: [PATCH 1/1] Set ControlPort to [% c("var/tor_control_port") %]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js
-index 34bf1a7..b95b00f 100644
+index 752514a..7c1752a 100644
 --- a/src/defaults/preferences/prefs.js
 +++ b/src/defaults/preferences/prefs.js
-@@ -3,7 +3,7 @@ pref("extensions.torlauncher.logmethod", 1);  // 0=stdout, 1=errorconsole, 2=deb
- pref("extensions.torlauncher.max_tor_log_entries", 1000);
- 
+@@ -16,7 +16,7 @@ pref("extensions.torlauncher.max_tor_log_entries", 1000);
+ // override the default IPC object location. If a relative path is used,
+ // it is handled like torrc_path (see below).
  pref("extensions.torlauncher.control_host", "127.0.0.1");
 -pref("extensions.torlauncher.control_port", 9151);
 +pref("extensions.torlauncher.control_port", [% c("var/tor_control_port") %]);
+ pref("extensions.torlauncher.control_port_use_ipc", false);
+ pref("extensions.torlauncher.control_ipc_path", "");
  
- pref("extensions.torlauncher.start_tor", true);
- pref("extensions.torlauncher.prompt_at_startup", true);
 -- 
-2.1.3
+2.13.3