[flashproxy/master] facilitator_publickey_filename → facilitator_pubkey_filename.

[dcf at torproject.org]

commit eeb4bcbd52556c0b756ba1bd53c10509e191972a
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Apr 29 23:42:25 2013 -0700

    facilitator_publickey_filename → facilitator_pubkey_filename.
---
 flashproxy-reg-email |    4 ++--
 flashproxy-reg-url   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flashproxy-reg-email b/flashproxy-reg-email
index 2d333bc..45609c9 100755
--- a/flashproxy-reg-email
+++ b/flashproxy-reg-email
@@ -91,7 +91,7 @@ class options(object):
     smtp_addr = None
     debug = False
     address_family = socket.AF_UNSPEC
-    facilitator_publickey_filename = None
+    facilitator_pubkey_filename = None
 
 def usage(f = sys.stdout):
     print >> f, """\
@@ -200,7 +200,7 @@ for o, a in opts:
     elif o == "-e" or o == "--email":
         options.email_addr = a
     elif o == "-k" or o == "--facilitator-pubkey":
-        options.facilitator_publickey_filename = a
+        options.facilitator_pubkey_filename = a
     elif o == "-h" or o == "--help":
         usage()
         sys.exit()
diff --git a/flashproxy-reg-url b/flashproxy-reg-url
index e1497de..b9cdcc9 100755
--- a/flashproxy-reg-url
+++ b/flashproxy-reg-url
@@ -32,7 +32,7 @@ def get_facilitator_pubkey(filename):
 
 class options(object):
     facilitator_url = None
-    facilitator_publickey_filename = None
+    facilitator_pubkey_filename = None
 
 def usage(f = sys.stdout):
     print >> f, """\
@@ -109,7 +109,7 @@ for o, a in opt:
     if o == "-f" or o == "--facilitator":
         options.facilitator_url = a
     elif o == "-k" or o == "--facilitator-pubkey":
-        options.facilitator_publickey_filename = a
+        options.facilitator_pubkey_filename = a
     elif o == "-h" or o == "--help":
         usage()
         sys.exit()