[tor-commits] [bridgedb/master] Add NO_DISTRIBUTION_COUNTRIES option to config.

[isis@xxxxxxxxxxxxxx]

commit a92cf111584c296a5e589f7412bf5ea27bae5dcd
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Tue Aug 12 03:16:47 2014 +0000

    Add NO_DISTRIBUTION_COUNTRIES option to config.
    
    This option contains a list of CCs for which, if a bridge is detected to
    be running on an IP address in one of these countries, it will not be
    distributed to clients.
    
     * FIXES part of #12843.
---
 bridgedb.conf             |   11 ++++++++++-
 lib/bridgedb/configure.py |    2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 1fe61ab..f8b126c 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -15,11 +15,15 @@
 #           for details.
 # :copyright: (c) 2007-2014 The Tor Project, Inc.
 #             (c) 2007-2014, all sentient entities within the AUTHORS file
-# :version: 0.0.10
+# :version: 0.0.13
 #===============================================================================
 #
 # CHANGELOG:
 # ~~~~~~~~~~
+# Changes in version 0.0.13 - 2015-02-20
+#   * ADD NO_DISTRIBUTION_COUNRIES option for refusing to distribute bridges
+#     whose primary ORAddress is geolocated to any of some certain countries.
+#
 # Changes in version 0.0.12 - 2015-02-06
 #   * ADD a dictionary of TASKS to be run and the intervals at which they
 #     should be repeated.
@@ -187,6 +191,11 @@ COLLECT_TIMESTAMPS = False
 # Filename that contains blocked bridges list. Comment out to disable.
 #COUNTRY_BLOCK_FILE = "blocked-bridges"
 
+# (list of two-character, uppercased strings for country codes) Don't
+# distribute bridges whose main ORPort IP address is geolocated to any of the
+# following countries:
+NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY']
+
 # A list of filenames that contain IP addresses (one per line) of proxies.
 # All IP-based distributors that see an incoming connection from a proxy
 # will treat them specially.
diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py
index e67a252..83b53d6 100644
--- a/lib/bridgedb/configure.py
+++ b/lib/bridgedb/configure.py
@@ -111,7 +111,7 @@ def loadConfig(configFile=None, configCls=None):
         else:
             setattr(config, attr, os.path.abspath(os.path.expanduser(setting)))
 
-    for attr in ["FORCE_PORTS", "FORCE_FLAGS"]:
+    for attr in ["FORCE_PORTS", "FORCE_FLAGS", "NO_DISTRIBUTION_COUNTRIES"]:
         setting = getattr(config, attr, []) # Default to empty lists
         setattr(config, attr, setting)
 



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