January 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Update gen_bridge_descriptors docstrings, add TODO note on making NTOR keys.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit d9f08c775387e2eb71b0c66305c55d516260301c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Oct 30 01:44:44 2013 +0000 Update gen_bridge_descriptors docstrings, add TODO note on making NTOR keys. --- scripts/gen_bridge_descriptors | 49 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/scripts/gen_bridge_descriptors b/scripts/gen_bridge_descriptors index ddfd86e..7050647 100644 --- a/scripts/gen_bridge_descriptors +++ b/scripts/gen_bridge_descriptors @@ -13,6 +13,29 @@ # (c) 2013 The Tor Project, Inc. #______________________________________________________________________________ +"""gen_bridge_descriptors -- Generate fake Tor relay signed descriptors. + +** TODO: ** + +Finish enough CFFI_ bindings for the newer PyNaCl_ (or enough of the +SWIG_ bindings for the older pynacl_) to be able to emulate the following +curvecp_ command (the ``curvecp*`` commands require libchloride_): + + $ curvecpmakekey ntor-key + $ curvecpprintkey ntor-key > ntor-key.hex + $ python -c 'import binascii, sys; \ + key_hex=open('./ntor-key.hex','rb').read();\ + key_b64=binascii.b2a_base64(binascii.unhexlify(key_hex));\ + sys.stdout.write(key_b64);' + + .. _CFFI: https://cffi.readthedocs.org + .. _PyNaCl: https://github.com/seanlynch/pynacl + .. _SWIG: https://github.com/swig/swig + .. _pynacl: https://github.com/seanlynch/pynacl + .. _curvecp: http://curvecp.org/ + .. _libchloride: https://github.com/jedisct1/libchloride +""" + from __future__ import print_function from __future__ import absolute_import from __future__ import unicode_literals @@ -122,6 +145,12 @@ def randomPort(): return random.randint(1025, 65535) def getHexString(size): + """Get a capitalised hexidecimal string ``size`` bytes long. + + :param integer size: The number of bytes in the returned string. + :rtype: string + :returns: A hex string. + """ s = "" for i in xrange(size): s += random.choice("ABCDEF0123456789") @@ -234,9 +263,9 @@ def makeFingerprintLine(fingerprint, version=None): | opt fingerprint D4BB C339 2560 1B7F 226E 133B A85F 72AF E734 0B29 | + :param string fingerprint: A public key fingerprint in groups of four, + separated by spaces. :param string version: One of ``SERVER_VERSIONS``. - :param string timestamp: The timestamp, in seconds since Epoch, to record - in the 'published' line. :rtype: string :returns: An '@type [bridge-]server-descriptor' 'published' line. """ @@ -568,6 +597,16 @@ def generateNetstatus(idkey_digest, server_desc_digest, timestamp, ipv4, orport, ipv6=None, dirport=None, flags='Fast Guard Running Stable Valid', bandwidth_line=None): + """Generate an ``@type networkwork-status`` document (unsigned). + + DOCDOC + + :param XXX idkey_digest: The SHA-1 digest of the router's public identity + key. + :param XXX server_desc_digest: The SHA-1 digest of the router's + ``@type [bridge-]server-descriptor``, before the descriptor is signed. + :param XXX timestamp: + """ idkey_b64 = binascii.b2a_base64(idkey_digest) idb64 = str(idkey_b64).strip().rstrip('=========') @@ -625,6 +664,12 @@ def signDescriptorDigest(key, descriptorDigest, digest='sha1'): see http://www.emc.com/collateral/white-papers/h11300-pkcs-1v2-2-rsa-cryptograp… for why this function is totally wrong. + + :type key: :class:`OpenSSL.crypto.PKey` + :param key: An RSA private key. + :param string descriptorDigest: The raw SHA-1 digest of any descriptor + document. + :param string digest: The digest to use. (default: 'sha1') """ sig = binascii.b2a_base64(OpenSSL.crypto.sign(key, descriptorDigest, digest))

1 0

[bridgedb/master] Remove bridgedb.Main.CONFIG dictionary.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit d6bfba9c15497922a75b06483ba69563b9e714d3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 5 05:27:37 2013 +0000 Remove bridgedb.Main.CONFIG dictionary. * REMOVE the hardcoded dict CONFIG from bridgedb.Main, it is not used anywhere, most of the settings are outdated at this point, and all of the settings are in the main config file, bridgedb.conf. --- lib/bridgedb/Main.py | 64 -------------------------------------------------- 1 file changed, 64 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index b196bc5..b4dbaeb 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -34,70 +34,6 @@ class Conf: if key.upper() == key: self.__dict__[key] = value -# An example configuration. Used for testing. See sample -# bridgedb.conf for documentation. -CONFIG = Conf( - RUN_IN_DIR = ".", - - PIDFILE = "bridgedb.pid", - LOGFILE = None, - LOGLEVEL = "DEBUG", - - BRIDGE_FILES = [ "./cached-descriptors", "./cached-descriptors.new" ], - STATUS_FILE = "networkstatus-bridges", - BRIDGE_PURPOSE = "bridge", - DB_FILE = "./bridgedist.db", - DB_LOG_FILE = "./bridgedist.log", - - N_IP_CLUSTERS = 4, - MASTER_KEY_FILE = "./secret_key", - - ASSIGNMENTS_FILE = "assignments.log", - - FORCE_PORTS = [(443, 1)], - FORCE_FLAGS = [("Stable", 1)], - PROXY_LIST_FILES = [ ], - - HTTPS_DIST = True, - HTTPS_SHARE=10, - HTTPS_BIND_IP=None, - HTTPS_PORT=6789, - HTTPS_CERT_FILE="cert", - HTTPS_KEY_FILE="privkey.pem", - HTTPS_USE_IP_FROM_FORWARDED_HEADER=0, - HTTP_UNENCRYPTED_BIND_IP=None, - HTTP_UNENCRYPTED_PORT=6788, - HTTP_USE_IP_FROM_FORWARDED_HEADER=1, - HTTPS_N_BRIDGES_PER_ANSWER=2, - HTTPS_INCLUDE_FINGERPRINTS = False, - - EMAIL_DIST = True, - EMAIL_SHARE=10, - EMAIL_FROM_ADDR = "bridges(a)torproject.org", - EMAIL_SMTP_FROM_ADDR = "bridges(a)torproject.org", - EMAIL_USERNAME = "bridges", - EMAIL_DOMAINS = [ "gmail.com", "yahoo.com", "catbus.wangafu.net" ], - EMAIL_DOMAIN_MAP = { "mail.google.com" : "gmail.com", - "googlemail.com" : "gmail.com", }, - EMAIL_DOMAIN_RULES = { 'gmail.com' : ["ignore_dots", "dkim"], - 'yahoo.com' : ["dkim"] }, - EMAIL_RESTRICT_IPS=[], - EMAIL_BIND_IP="127.0.0.1", - EMAIL_PORT=6725, - EMAIL_N_BRIDGES_PER_ANSWER=2, - EMAIL_INCLUDE_FINGERPRINTS = False, - EMAIL_SMTP_HOST="127.0.0.1", - EMAIL_SMTP_PORT=25, - EMAIL_GPG_SIGNING_ENABLED = False, - EMAIL_GPG_SIGNING_KEY = "bridgedb-gpg.sec", - - RESERVED_SHARE=2, - - FILE_BUCKETS = {}, - RECAPTCHA_ENABLED = False, - RECAPTCHA_PUB_KEY = '', - RECAPTCHA_PRIV_KEY = '', - ) def configureLogging(cfg): """Set up Python's logging subsystem based on the configuratino.

1 0

[bridgedb/master] Fix logs in bridgedb.Main to record the filename that was used.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 1e5811b1b0739f5b2366394d3afd0bd7ec5bd06f Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 5 05:42:48 2013 +0000 Fix logs in bridgedb.Main to record the filename that was used. There were a couple loglines in bridgedb.Main, most of them for when the descriptor files are opened/closed, which did ``os.path.abspath`` on the filename string taken from the config, and then logged statements like "Opening something something file: %s" with the absolute path. On the next line, the non-absolute path of the filename is opened. * CHANGE log statements to record paths as they are passed to open(). --- lib/bridgedb/Main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 824d328..964c737 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -85,7 +85,7 @@ def load(cfg, splitter, clear=False): addresses = {} timestamps = {} if hasattr(cfg, "STATUS_FILE"): - logging.info("Opening Network Status document %s", os.path.abspath(cfg.STATUS_FILE)) + logging.info("Opening Network Status document %s" % cfg.STATUS_FILE) f = open(cfg.STATUS_FILE, 'r') for ID, running, stable, or_addresses, timestamp in Bridges.parseStatusFile(f): status[ID] = running, stable @@ -126,7 +126,7 @@ def load(cfg, splitter, clear=False): for timestamp in ts: bridgedb.Stability.addOrUpdateBridgeHistory( bridge, timestamp) - logging.debug("Closing descriptor document") + logging.debug("Closing server-descriptor document") f.close() # read pluggable transports from extra-info document @@ -328,7 +328,8 @@ def startup(cfg, options): # Dump bridge pool assignments to disk. try: - logging.debug("Dumping pool assignments file") + logging.debug("Dumping pool assignments to file: '%s'" + % cfg.ASSIGNMENTS_FILE) f = open(cfg.ASSIGNMENTS_FILE, 'a') f.write("bridge-pool-assignment %s\n" % time.strftime("%Y-%m-%d %H:%M:%S"))

1 0

[bridgedb/master] Minor PEP8ification of bridgedb.Main module.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 431a0d9df06f89730a4366df958042e04d7a21ec Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 5 05:36:54 2013 +0000 Minor PEP8ification of bridgedb.Main module. --- lib/bridgedb/Main.py | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index b4dbaeb..824d328 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -54,7 +54,8 @@ def configureLogging(cfg): handler = logging.handlers.RotatingFileHandler(logfile, 'a', logfile_rotate_size, logfile_count) - formatter = logging.Formatter('%(asctime)s [%(levelname)s] %(message)s', "%b %d %H:%M:%S") + formatter = logging.Formatter('%(asctime)s [%(levelname)s] %(message)s', + "%b %d %H:%M:%S") handler.setFormatter(formatter) logging.getLogger().addHandler(handler) @@ -96,13 +97,15 @@ def load(cfg, splitter, clear=False): f.close() bridges = {} db = bridgedb.Storage.getDB() + for fname in cfg.BRIDGE_FILES: logging.info("Opening cached Descriptor document %s", fname) logging.debug("Parsing document for purpose=%s", cfg.BRIDGE_PURPOSE) f = open(fname, 'r') for bridge in Bridges.parseDescFile(f, cfg.BRIDGE_PURPOSE): if bridge.getID() in bridges: - logging.warn("Parsed bridge that we've already added. Skipping.") + logging.warn( + "Parsed bridge that we've already added. Skipping.") logging.debug(" Bridge: %s" % bridge.getID()) continue else: @@ -121,32 +124,36 @@ def load(cfg, splitter, clear=False): ts = timestamps[bridge.getID()][:] ts.sort() for timestamp in ts: - bridgedb.Stability.addOrUpdateBridgeHistory(bridge, timestamp) + bridgedb.Stability.addOrUpdateBridgeHistory( + bridge, timestamp) logging.debug("Closing descriptor document") f.close() + # read pluggable transports from extra-info document # XXX: should read from networkstatus after bridge-authority # does a reachability test - if hasattr(cfg, "EXTRA_INFO_FILE"): - logging.info("Opening Extra Info document %s", os.path.abspath(cfg.EXTRA_INFO_FILE)) + logging.info("Opening extra-info document: '%s'" % cfg.EXTRA_INFO_FILE) f = open(cfg.EXTRA_INFO_FILE, 'r') for transport in Bridges.parseExtraInfoFile(f): ID, method_name, address, port, argdict = transport if bridges[ID].running: logging.debug(" Appending transport to running bridge") - bridges[ID].transports.append(Bridges.PluggableTransport(bridges[ID], - method_name, address, port, argdict)) + bridgePT = Bridges.PluggableTransport( + bridges[ID], method_name, address, port, argdict) + bridges[ID].transports.append(bridgePT) assert bridges[ID].transports, "We added a transport but it disappeared!" logging.debug("Closing extra-info document") f.close() if hasattr(cfg, "COUNTRY_BLOCK_FILE"): - logging.info("Opening Blocking Countries file %s", os.path.abspath(cfg.COUNTRY_BLOCK_FILE)) + logging.info("Opening Blocking Countries file %s" + % cfg.COUNTRY_BLOCK_FILE) f = open(cfg.COUNTRY_BLOCK_FILE, 'r') - for ID,address,portlist,countries in Bridges.parseCountryBlockFile(f): + for ID, address, portlist, countries in Bridges.parseCountryBlockFile(f): if ID in bridges.keys() and bridges[ID].running: for port in portlist: - logging.debug(":.( Tears! %s blocked %s %s:%s", - countries, bridges[ID].fingerprint, address, port) + logging.debug(":.( Tears! %s blocked %s %s:%s" + % (countries, bridges[ID].fingerprint, + address, port)) try: bridges[ID].blockingCountries["%s:%s" % \ (address, port)].update(countries) @@ -154,7 +161,7 @@ def load(cfg, splitter, clear=False): bridges[ID].blockingCountries["%s:%s" % \ (address, port)] = set(countries) logging.debug("Closing blocking-countries document") - f.close() + f.close() bridges = None @@ -205,20 +212,20 @@ def startup(cfg, options): cfg.PROXY_LIST_FILES = [ os.path.expanduser(v) for v in cfg.PROXY_LIST_FILES ] else: - cfg.PROXY_LIST_FILES = [ ] + cfg.PROXY_LIST_FILES = [] # Write the pidfile. if cfg.PIDFILE: f = open(cfg.PIDFILE, 'w') - f.write("%s\n"%os.getpid()) + f.write("%s\n" % os.getpid()) f.close() # Set up logging. configureLogging(cfg) - #XXX import Servers after logging is set up - # Otherwise, python will create a default handler that logs to - # the console and ignore further basicConfig calls + # Import Servers after logging is set up. Otherwise, python will create a + # default handler that logs to the console and ignore further basicConfig + # calls. from bridgedb import EmailServer from bridgedb import HTTPServer @@ -309,7 +316,7 @@ def startup(cfg, options): ipDistributor.prepopulateRings() # create default rings logging.info("%d for web:", len(ipDistributor.splitter)) for (n,(f,r)) in ipDistributor.splitter.filterRings.items(): - logging.info(" by filter set %s, %d" % (n, len(r))) + logging.info("\tby filter set %s, %d" % (n, len(r))) #logging.info(" by location set: %s", # " ".join(str(len(r)) for r in ipDistributor.rings)) #logging.info(" by category set: %s",

1 0

[bridgedb/master] Fix a bug where bridgedb.Main only opens one extra-info file, not both.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 7cf1f52a76020d928e3ee598610afe382fd25c7e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 5 05:51:41 2013 +0000 Fix a bug where bridgedb.Main only opens one extra-info file, not both. The old config item, EXTRA_INFO_FILE, was changed to a list, EXTRA_INFO_FILES, some time ago, in commit 5c86df37fa1938508144bb52c971a3c31be0b310. However, the config item searched for in bridgedb.Main was not, causing the extra-info descriptor files not to be read. * CHANGE bridgedb.Main to read extra-info descriptor filenames from EXTRA_INFO_FILES config setting, not EXTRA_INFO_FILE. * FIXES bug causing extra-info files not to be read. --- lib/bridgedb/Main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 27b1339..5479d6a 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -131,8 +131,9 @@ def load(cfg, splitter, clear=False): # read pluggable transports from extra-info document # XXX: should read from networkstatus after bridge-authority # does a reachability test - logging.info("Opening extra-info document: '%s'" % cfg.EXTRA_INFO_FILE) - f = open(cfg.EXTRA_INFO_FILE, 'r') + for filename in cfg.EXTRA_INFO_FILES: + logging.info("Opening extra-info document: '%s'" % filename) + f = open(filename, 'r') for transport in Bridges.parseExtraInfoFile(f): ID, method_name, address, port, argdict = transport if bridges[ID].running:

1 0

[bridgedb/master] Add loadConfig function for reloading .conf on top of settings.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit d9343ec4593728b83ebb8b1e534d2b523d27792d Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 5 08:03:44 2013 +0000 Add loadConfig function for reloading .conf on top of settings. The .conf file must be loaded on top of the configuration instance as it exists in memory, otherwise settings will not be persistent. * FIXES part of #9277. --- lib/bridgedb/Main.py | 60 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 384547e..27c438d 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -14,6 +14,8 @@ import logging import logging.handlers import gettext +from pprint import pprint + from twisted.internet import reactor from bridgedb import crypto @@ -171,6 +173,43 @@ def load(cfg, splitter, clear=False): bridges = None +def loadConfig(options, config=None): + """Load configuration settings on top of the current settings. + + :type options: :class:`bridgedb.opt.MainOptions` + :param options: A pre-parsed options class containing any arguments and + options given in the commandline we were called with. + :type config: :class:`bridgedb.Main.Conf` or None + :param config: The current configuration. + + :rtype: :class:`Conf` + :returns: A new configuration, with the old settings as defaults, and the + settings from the config file overriding them. + """ + configuration = {} + + if config: + oldConfig = config.__dict__ + configuration.update(**oldConfig) # Load current settings + logging.info("Reloading over in-memory configurations...") + + logging.debug("Old configuration settings:\n%s" + % pprint(configuration, depth=4)) + + if options['config']: + configFile = options['config'] + logging.info("Loading settings from config file: '%s'" % configFile) + compiled = compile(open(configFile).read(), '<string>', 'exec') + exec compiled in configuration + + logging.debug("New configuration settings:\n%s" + % pprint(configuration, depth=4)) + + # Create a :class:`Conf` from the settings stored within the local scope + # of the ``configuration`` dictionary: + config = Conf(**configuration) + return config + def loadProxyList(cfg): ipset = {} for fname in cfg.PROXY_LIST_FILES: @@ -380,20 +419,31 @@ def run(options): starting/reloading the servers or dumping bridge assignments to files. :type options: :class:`bridgedb.opt.MainOptions` - :param options: A pre-parsed options class. + :param options: A pre-parsed options class containing any arguments and + options given in the commandline we were called with. """ configuration = {} + rundir = os.getcwd() if not options['config']: options.getUsage() sys.exit(1) - # Change to the directory where we're supposed to run. if options['rundir']: - os.chdir(options['rundir']) + rundir = os.path.abspath(os.path.expanduser(options['rundir'])) - execfile(options['config'], configuration) - config = Conf(**configuration) + # Change to the directory where we're supposed to run. This must be done + # before parsing the config file, otherwise there will need to be two + # copies of the config file, one in the directory BridgeDB is started in, + # and another in the directory it changes into. + os.chdir(rundir) + + compiled = compile(open(options['config']).read(), '<string>', 'exec') + exec compiled in configuration + cfg = Conf(**configuration) + + # Store the rundir in case it needs to be used again later: + cfg.RUNDIR = rundir if options['dump-bridges']: bucketManager = Bucket.BucketManager(config)

1 0

[bridgedb/master] Fix bug resulting from use of fd.close() instead of os.close(fd).
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit f1c8d5204bfc71cdc3ddee1fd135856ec9ec1c56 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 5 08:09:19 2013 +0000 Fix bug resulting from use of fd.close() instead of os.close(fd). --- lib/bridgedb/crypto.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 70e9ee1..d67966d 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -50,7 +50,7 @@ def getKey(filename): fd = os.open(filename, flags, 0400) os.write(fd, key) os.fsync(fd) - fd.close() + os.close(fd) else: logging.debug("getKey(): Secret key file found. Loading...") key = fh.read()

1 0

[bridgedb/master] Change formatting of two logs in bridgedb.Main to use '%' syntax.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit b780f6f341f0432a3114e1c5f76f37079533c8e2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 5 08:10:22 2013 +0000 Change formatting of two logs in bridgedb.Main to use '%' syntax. --- lib/bridgedb/Main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 27c438d..e648771 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -101,8 +101,8 @@ def load(cfg, splitter, clear=False): db = bridgedb.Storage.getDB() for fname in cfg.BRIDGE_FILES: - logging.info("Opening cached Descriptor document %s", fname) - logging.debug("Parsing document for purpose=%s", cfg.BRIDGE_PURPOSE) + logging.info("Opening cached server-descriptor document: '%s'" % fname) + logging.debug("Parsing document for purpose=%s" % cfg.BRIDGE_PURPOSE) f = open(fname, 'r') for bridge in Bridges.parseDescFile(f, cfg.BRIDGE_PURPOSE): if bridge.getID() in bridges:

1 0

[bridgedb/master] Remove unused imports from bridgedb.parse.headers.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 4e1db79b6680db4add734702b402232ea5eef517 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 5 08:07:17 2013 +0000 Remove unused imports from bridgedb.parse.headers. --- lib/bridgedb/parse/headers.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/bridgedb/parse/headers.py b/lib/bridgedb/parse/headers.py index 6b9d371..b47e67b 100644 --- a/lib/bridgedb/parse/headers.py +++ b/lib/bridgedb/parse/headers.py @@ -19,11 +19,6 @@ """ -import logging - -import re -import os - def parseAcceptLanguage(header): """Parse the contents of a client 'Accept-Language' header.

1 0

[bridgedb/master] PEP8ify one line in bridgedb.Main.startup().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit c693836b0ca0b5ceaa017d1fec0892444fefcbd6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 5 08:11:26 2013 +0000 PEP8ify one line in bridgedb.Main.startup(). --- lib/bridgedb/Main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index e648771..502d754 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -281,8 +281,7 @@ def startup(cfg, options): key = bridgedb.crypto.getKey(cfg.MASTER_KEY_FILE) # Initialize our DB file. - db = bridgedb.Storage.Database(cfg.DB_FILE+".sqlite", - cfg.DB_FILE) + db = bridgedb.Storage.Database(cfg.DB_FILE + ".sqlite", cfg.DB_FILE) bridgedb.Storage.setGlobalDB(db) # Get a proxy list.

1 0