[tor-commits] [flashproxy/master] Merge branch 'master' into rtmfp

[dcf at torproject.org]

commit 4ba49ccb6c04da8565f06923a30734aa765414cd
Merge: d5c1258 9b584d0
Author: David Fifield <david at bamsoftware.com>
Date:   Tue May 24 22:56:05 2011 -0700

    Merge branch 'master' into rtmfp

 badge.png             |  Bin 264 -> 682 bytes
 badge_con_counter.png |  Bin 270 -> 0 bytes
 nat-birthday.py       |  132 -----------------------------------
 notes.txt             |    2 -
 swfcat.as             |  184 +++++++++++++++++++++++++++++++++++++++++++++----
 5 files changed, 170 insertions(+), 148 deletions(-)

diff --cc swfcat.as
index 76de948,6f4be0c..108f6eb
--- a/swfcat.as
+++ b/swfcat.as
@@@ -45,13 -50,13 +50,15 @@@ packag
          /* Number of proxy pairs ever connected. */
          private var total_proxy_pairs:int = 0;
  
+         public var rate_limit:RateLimit;
+ 
          /* Badge with a client counter */
-         [Embed(source="badge_con_counter.png")]
+         [Embed(source="badge.png")]
          private var BadgeImage:Class;
 -        private var client_count_tf:TextField;
 -        private var client_count_fmt:TextFormat;
 +        private var tot_client_count_tf:TextField;
 +        private var tot_client_count_fmt:TextFormat;
 +        private var cur_client_count_tf:TextField;
 +        private var cur_client_count_fmt:TextFormat;
  
          public function puts(s:String):void
          {