[tor-commits] [bridgedb/develop] Merge remote-tracking branch 'tpo-sysrqb/develop' into develop

[isis at torproject.org]

commit f2ecd0d49951b4efbf69969d1d9c0403ca04e929
Merge: a619387 bf3027a
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Feb 1 23:52:42 2014 +0000

    Merge remote-tracking branch 'tpo-sysrqb/develop' into develop
    
    Conflicts:
    	bridgedb.conf

 README        |   19 ++++++++-------
 bridgedb.conf |   74 +++++++++++++++++++++++++++++++--------------------------
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --cc bridgedb.conf
index bcde0cf,534a4fe..9bf414a
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@@ -131,11 -121,21 +126,34 @@@ SAFELOGGING = Tru
  LOGFILE_COUNT = 5
  LOGFILE_ROTATE_SIZE = 10000000
  
- # Only consider routers whose purpose matches this string.
- BRIDGE_PURPOSE = "bridge"
++#---------------------------
++# Database/Parsing Options  \
++#------------------------------------------------------------------------------
++#
++# These options change various database transaction and descriptor parsing
++# behaviours.
++#------------------------------------------------------------------------------
 +
- # File to which we dump bridge pool assignments for statistics.
- ASSIGNMENTS_FILE = "assignments.log"
++# (boolean) If True, then collect, sort, and store all timestamps seen for all
++# bridges. This operation is extremely expensive, and should be disabled when
++# it is not necessary.
++COLLECT_TIMESTAMPS = True
++
+ #-------------------------------
+ # General Distribution Options  \
+ #------------------------------------------------------------------------------
+ #
+ # These options are not specific to a certain distributor and they may alter
+ # the bridge selection process in certain circumstances.
+ #------------------------------------------------------------------------------
+ 
+ # Filename that contains blocked bridges list. Comment out to disable.
+ #COUNTRY_BLOCK_FILE = "blocked-bridges"
+ 
+ # 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.
+ 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
@@@ -207,6 -197,18 +215,14 @@@ HTTP_UNENCRYPTED_PORT = Non
  # unencrypted connections.
  HTTP_USE_IP_FROM_FORWARDED_HEADER = False
  
 -# How many bridges do we try to give back in an answer by the
 -# unencrypted HTTP distributor?
 -HTTP_N_BRIDGES_PER_ANSWER = 3
 -
+ # Options related to recaptcha support.
+ # Enable/Disable recaptcha
+ RECAPTCHA_ENABLED = False
+ 
+ # Recaptcha API keys
+ RECAPTCHA_PUB_KEY = ''
+ RECAPTCHA_PRIV_KEY = ''
+ 
  #-------------------------------
  # Email Distribution Options    \
  #------------------------------------------------------------------------------