[tor-commits] [bridgedb/master] Move N_IP_CLUSTERS into the HTTPS distributor-specific settings.

[isis at torproject.org]

commit 70009a726f6076036f29909fc5476ae4cc94fd2d
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Apr 2 01:32:45 2015 +0000

    Move N_IP_CLUSTERS into the HTTPS distributor-specific settings.
---
 bridgedb.conf |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 2a1c367..cbdead0 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -217,12 +217,6 @@ NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY']
 # will treat them specially.
 PROXY_LIST_FILES = []
 
-# How many clusters do we group IPs in when distributing bridges based on IP?
-# Note that if PROXY_LIST_FILES is set (below), what we actually do here
-# is use one higher than the number here, and the extra cluster is used
-# for answering requests made by IP addresses in the PROXY_LIST_FILES file.
-N_IP_CLUSTERS = 4
-
 # If possible, always give a certain number of answers with a given ORPort.
 # This is a list of ``(port, minimum)`` tuples.
 FORCE_PORTS = [(443, 1)]
@@ -300,6 +294,12 @@ HTTPS_INCLUDE_FINGERPRINTS = True
 # the *last* entry from its X-Forwarded-For header as the client's IP.
 HTTPS_USE_IP_FROM_FORWARDED_HEADER = False
 
+# How many clusters do we group IPs in when distributing bridges based on IP?
+# Note that if PROXY_LIST_FILES is set (below), what we actually do here
+# is use one higher than the number here, and the extra cluster is used
+# for answering requests made by IP addresses in the PROXY_LIST_FILES file.
+N_IP_CLUSTERS = 4
+
 # (string or None) The period at which the available bridges rotates to a
 # separate set of bridges.  This setting can be used in the form
 #