two config changes

svn:r12827

README

@@ -5,10 +5,8 @@ To set up:
  - python setup.py install --prefix=$HOME
  - Edit bridgedb.conf; put it somewhere good.
  - Make sure that the input files referred to in bridgedb.conf exist.
-   - Yes, this includes all of them.
-     - Yes, even the cert file.
-       - You can make a self-signed certificate with
-         openssl req -x509 -new -nodes > ! cert
+   - You can make a self-signed certificate with
+     openssl req -x509 -new -nodes > cert
  - Set up PYTHONPATH to include "~/lib/python2.4/site-packages/".
 
 To run:

bridgedb.conf

@@ -46,7 +46,7 @@ HTTPS_KEY_FILE="privkey.pem"
 HTTP_UNENCRYPTED_BIND_IP=None
 HTTP_UNENCRYPTED_PORT=None
 # How many bridges do we give back in an answer?
-HTTPS_N_BRIDGES_PER_ANSWER=2
+HTTPS_N_BRIDGES_PER_ANSWER=3
 
 #==========
 # Options related to Email
@@ -68,7 +68,7 @@ EMAIL_RESTRICT_IPS=[]
 # IP and port to listen on for email connections. Debugging only.
 EMAIL_BIND_IP=None
 EMAIL_PORT=6725
-# How many bridges to we give back in an answer?
+# How many bridges do we give back in an answer?
 EMAIL_N_BRIDGES_PER_ANSWER=2
 
 #==========
@@ -78,8 +78,7 @@ EMAIL_N_BRIDGES_PER_ANSWER=2
 # accessible by email queries; and a group that we don't assign to any
 # query mechanism.  Once a bridge is assigned to either of the first
 # two groups, it stays there persistently.  The bridges are allocated
-# to these groups in an proportion of
+# to these groups in a proportion of
 #   HTTPS_SHARE : EMAIL_SHARE : RESERVED_SHARE
 RESERVED_SHARE=2
 
-

lib/bridgedb/Server.py

@@ -137,7 +137,7 @@ class MailContext:
         self.maximumSize = 32*1024
         self.smtpServer = "127.0.0.1"
         self.smtpPort = 25
-        self.fromAddr = "bridges@bridges.torproject.org"
+        self.fromAddr = "bridges@torproject.org"
         self.distributor = dist
         self.schedule = sched
         self.N = cfg.EMAIL_N_BRIDGES_PER_ANSWER

setup.py

 # BridgeDB by Nick Mathewson.
 # Copyright (c) 2007, The Tor Project, Inc.
-# See LICENSE for licensing informatino
+# See LICENSE for licensing information
 
 import distutils
 import sys