[tor-commits] [bridgedb/master] Add bridgedb.conf settings from bridgedb-admin repo.

[isis at torproject.org]

commit 87451679860c3e1561a61d309c5c894a54d00dc2
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Mar 28 06:43:36 2014 +0000

    Add bridgedb.conf settings from bridgedb-admin repo.
---
 bridgedb.conf |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 1eb3037..006f715 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -15,15 +15,21 @@
 #           for details.
 # :copyright: (c) 2007-2013 The Tor Project, Inc.
 #             (c) 2007-2013, all sentient entities within the AUTHORS file
-# :version: 0.0.5
+# :version: 0.0.6
 #===============================================================================
 #
 # CHANGELOG:
 # ~~~~~~~~~~ 
+# Changes in version 0.0.6 - 2014-03-28
+#   * CHANGE gimp-captchas to be the norm.
+#   * ADD bucket for support team.
+#
 # Changes in version 0.0.5 - 2014-02-27
 #   * ADD GIMP_CAPTCHA_ENABLED, GIMP_CAPTCHA_DIR, GIMP_CAPTCHA_HMAC_KEYFILE,
 #     and GIMP_CAPTCHA_RSA_KEYFILE settings (see #10809).
 #   * Decrease email share.
+#   * Whitelist the public IP address of bridges.torproject.org in
+#     RECAPTCHA_REMOTE_IP setting.
 #
 # Changes in version 0.0.4 - 2014-01-24
 #   * ADD COLLECT_TIMESTAMPS option (see #10724). Set it to False for the