[tor-commits] [flashproxy/master] Rearrange.

[dcf at torproject.org]

commit 1279ff633a330242587f56bc0b24c6ab235032a6
Author: David Fifield <david at bamsoftware.com>
Date:   Sun May 19 00:38:19 2013 -0700

    Rearrange.
---
 flashproxy-reg-appspot |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot
index 569f8b9..fa5378e 100755
--- a/flashproxy-reg-appspot
+++ b/flashproxy-reg-appspot
@@ -61,13 +61,6 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
 # hashing the public key, not the entire certificate.
 PUBKEY_SHA1 = "c70ccd442ff4528c603aefef85206fd693990e09".decode("hex")
 
-def get_external_ip():
-    f = urlopen(urlparse.urlunparse(("https", FRONT_DOMAIN, "/ip", "", "", "")))
-    try:
-        return f.read()
-    finally:
-        f.close()
-
 class options(object):
     address_family = socket.AF_UNSPEC
     facilitator_pubkey_filename = None
@@ -210,6 +203,13 @@ def urlopen(url):
     opener = urllib2.build_opener(PinHTTPSHandler())
     return opener.open(req)
 
+def get_external_ip():
+    f = urlopen(urlparse.urlunparse(("https", FRONT_DOMAIN, "/ip", "", "", "")))
+    try:
+        return f.read()
+    finally:
+        f.close()
+
 opt, args = getopt.gnu_getopt(sys.argv[1:], "46h", ["facilitator-pubkey=", "help"])
 for o, a in opt:
     if o == "-4":