[Pkg-privacy-commits] [torbrowser-launcher] 13/21: Merge branch 'use_torbrowser_updates_xml' of https://github.com/boklm/torbrowser-launcher into boklm-use_torbrowser_updates_xml
Holger Levsen
holger at moszumanska.debian.org
Fri Nov 13 17:54:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to annotated tag debian/0.2.1-1
in repository torbrowser-launcher.
commit 5bed87dbd2f62d7fa0ce2578a0c385810cb92adc
Merge: a0634fa e07beac
Author: Micah Lee <micah at micahflee.com>
Date: Thu Nov 5 19:17:49 2015 -0800
Merge branch 'use_torbrowser_updates_xml' of https://github.com/boklm/torbrowser-launcher into boklm-use_torbrowser_updates_xml
Conflicts:
torbrowser_launcher/common.py
torbrowser_launcher/common.py | 4 ++--
torbrowser_launcher/launcher.py | 37 ++++++++++---------------------------
2 files changed, 12 insertions(+), 29 deletions(-)
diff --cc torbrowser_launcher/common.py
index 5da309c,ed63ae4..421cf4f
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@@ -139,10 -139,9 +139,10 @@@ class Common
'modem_sound': os.path.join(SHARE, 'modem.ogg'),
'download_dir': tbb_cache+'/download',
'gnupg_homedir': tbb_local+'/gnupg_homedir',
- 'settings_file': tbb_config+'/settings',
+ 'settings_file': tbb_config+'/settings.json',
+ 'settings_file_pickle': tbb_config+'/settings',
- 'update_check_url': 'https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions',
- 'update_check_file': tbb_cache+'/download/RecommendedTBBVersions',
+ 'update_check_url': 'https://dist.torproject.org/torbrowser/update_2/release/Linux_x86_64-gcc3/x/en-US',
+ 'update_check_file': tbb_cache+'/download/release.xml',
'tbb': {
'dir': tbb_local+'/tbb/'+self.architecture,
'dir_tbb': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language,
diff --cc torbrowser_launcher/launcher.py
index 2f75366,79b396d..1d0575b
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@@ -30,13 -30,12 +30,15 @@@ import os, subprocess, time, json, tarf
from twisted.internet import reactor
from twisted.web.client import Agent, RedirectAgent, ResponseDone, ResponseFailed
from twisted.web.http_headers import Headers
+from twisted.web.iweb import IPolicyForHTTPS
from twisted.internet.protocol import Protocol
-from twisted.internet.ssl import ClientContextFactory
+from twisted.internet.ssl import CertificateOptions
+from twisted.internet._sslverify import ClientTLSOptions
from twisted.internet.error import DNSLookupError
+from zope.interface import implementer
+ import xml.etree.ElementTree as ET
+
import OpenSSL
import pygtk
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git
More information about the Pkg-privacy-commits
mailing list