March 2013 - tor-commits - lists.torproject.org

[stem/master] Making the arrived_at arg of events optional
by atagar＠torproject.org 07 Mar '13

07 Mar '13

commit 32d39439b3a1cb2a72b2efc9d3010d2c90b174ee Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 6 20:12:06 2013 -0800 Making the arrived_at arg of events optional The kwargs of stem.response.convert() are documented as being optional, however the arrived_at argument for events was mandatory. Caught by meejah. --- stem/response/events.py | 6 +++++- test/unit/response/events.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 85710c2..af8c8e5 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -5,6 +5,7 @@ import datetime import re import StringIO +import time import stem import stem.control @@ -41,7 +42,10 @@ class Event(stem.response.ControlMessage): _SKIP_PARSING = False # skip parsing contents into our positional_args and keyword_args _VERSION_ADDED = stem.version.Version('0.1.1.1-alpha') # minimum version with control-spec V1 event support - def _parse_message(self, arrived_at): + def _parse_message(self, arrived_at = None): + if arrived_at is None: + arrived_at = int(time.time()) + if not str(self).strip(): raise stem.ProtocolError("Received a blank tor event. Events must at the very least have a type.") diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 8a685ff..803de0f 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -307,7 +307,7 @@ PURPOSE=DNS_REQUEST" def _get_event(content): controller_event = mocking.get_message(content) - stem.response.convert("EVENT", controller_event, arrived_at = 25) + stem.response.convert("EVENT", controller_event) return controller_event @@ -344,7 +344,7 @@ class TestEvents(unittest.TestCase): def test_event(self): # synthetic, contrived message construction to reach the blank event check - self.assertRaises(ProtocolError, stem.response.convert, "EVENT", stem.response.ControlMessage([('', '', '')], ''), arrived_at = 25) + self.assertRaises(ProtocolError, stem.response.convert, "EVENT", stem.response.ControlMessage([('', '', '')], '')) # Event._parse_message() on an unknown event type event = _get_event('650 NONE SOLID "NON SENSE" condition=MEH quoted="1 2 3"')

1 0

[torflow/master] 8417 - Add bwfiles file
by aagbsn＠torproject.org 07 Mar '13

07 Mar '13

commit b500f7e86566f87982e0d32063d8b59d46d1543b Author: aagbsn <aagbsn(a)extc.org> Date: Thu Mar 7 05:00:15 2013 +0100 8417 - Add bwfiles file --- NetworkScanners/BwAuthority/data/bwfiles | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/data/bwfiles b/NetworkScanners/BwAuthority/data/bwfiles new file mode 100644 index 0000000..7ad6b1a --- /dev/null +++ b/NetworkScanners/BwAuthority/data/bwfiles @@ -0,0 +1,9 @@ +1 4M +7 2M +23 1M +53 512k +82 256k +95 128k +99 64k +100 32k +. diff --git a/NetworkScanners/BwAuthority/data/bwfiles/.gitignore b/NetworkScanners/BwAuthority/data/bwfiles/.gitignore deleted file mode 100644 index e69de29..0000000

1 0

[torflow/master] Update Submodule TorCtl for 8273 support
by aagbsn＠torproject.org 07 Mar '13

07 Mar '13

commit 6ff0a3e8e8e398fa04b59d6491fb0693f786e5b1 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Mar 1 16:01:22 2013 +0100 Update Submodule TorCtl for 8273 support --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index e27fb55..fedee0d 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit e27fb553b471b8f0774ae81cb024b5507d49894e +Subproject commit fedee0d5053fb0b25f181d49fc3c577468eb86ed

1 0

[torflow/master] 8273 Measure relays with Unmeasured flag by default
by aagbsn＠torproject.org 07 Mar '13

07 Mar '13

commit 9d79bc4f54acb40b4de7c2871884c2c04b2ab690 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Mar 1 15:58:02 2013 +0100 8273 Measure relays with Unmeasured flag by default --- NetworkScanners/BwAuthority/bwauthority_child.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index be9d5fe..67801fc 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -28,6 +28,7 @@ import random sys.path.append("../../") from TorCtl.TorUtil import plog +from aggregate import write_file_list # WAAAYYYYYY too noisy. #import gc @@ -64,7 +65,8 @@ __selmgr = PathSupport.SelectionManager( use_exit=None, use_guards=False, exit_ports=[443], - order_by_ratio=True) # XXX: may be a poor idea for PID control? + order_by_ratio=True, # XXX: may be a poor idea for PID control? + use_unmeasured=True) # exit code to indicate scan completion # make sure to update this in bwauthority.py as well @@ -102,7 +104,11 @@ def choose_url(percentile): # TODO: Maybe we don't want to read the file *every* time? # Maybe once per slice? # Read in the bw auths file - f = file("./data/bwfiles", "r") + # here is a fine place to make sure we have bwfiles + try: + f = file("./data/bwfiles", "r") + except IOError: + write_file_list('./data') lines = [] valid = False for l in f.readlines(): @@ -209,6 +215,8 @@ def speedrace(hdlr, start_pct, stop_pct, circs_per_node, save_every, out_dir, if hdlr.is_count_met(circs_per_node, successful): break hdlr.wait_for_consensus() + + # Check local time. Do not scan between 01:30 and 05:30 local time lt = time.localtime() sleep_start = time.mktime(lt[0:3]+sleep_start_tp+(0,0,0)+(lt[-1],)) @@ -302,6 +310,7 @@ def main(argv): except Exception, e: traceback.print_exc() plog("WARN", "Can't connect to Tor: "+str(e)) + sys.exit(STOP_PCT_REACHED) if db_url: hdlr.attach_sql_listener(db_url) @@ -318,6 +327,7 @@ def main(argv): plog("INFO", "Set socks proxy to "+TorUtil.tor_host+":"+str(TorUtil.tor_port)) hdlr.wait_for_consensus() + pct_step = hdlr.rank_to_percent(nodes_per_slice) # check to see if we are done diff --git a/NetworkScanners/BwAuthority/data/bwfiles/.gitignore b/NetworkScanners/BwAuthority/data/bwfiles/.gitignore new file mode 100644 index 0000000..e69de29

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 07 Mar '13

07 Mar '13

commit 06e4b30f5da9c0bec25a9efdf38488b417e4e7f1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 7 03:15:38 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/server.po | 406 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 406 insertions(+), 0 deletions(-) diff --git a/zh_CN/server.po b/zh_CN/server.po new file mode 100644 index 0000000..3a7beb0 --- /dev/null +++ b/zh_CN/server.po @@ -0,0 +1,406 @@ +# +# Translators: +# chen zhang <magnyfx(a)hotmail.com>, 2011. +# Curtis Stone <cstone(a)fastmail.cn>, 2012. +# <hua5679(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-06-26 17:00+0200\n" +"PO-Revision-Date: 2013-03-07 03:10+0000\n" +"Last-Translator: simabull tsai <tsaizb(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. type: Content of: <html><body><h1> +#: en/server.html:16 +msgid "Setting Up a Tor Relay" +msgstr "设置 Tor 中继" + +#. type: Content of: <html><body> +#: en/server.html:19 +msgid "" +"The Tor network is made up of volunteers all over the world who donate some " +"of their spare bandwidth by running a Tor relay. Vidalia helps you do your " +"part by making it easy to set up a relay of your own. <a name=\"basic\"/>" +msgstr "Tor 网络由世界各地的志愿者组成，这些人通过运行 Tor 中继来贡献一部分他们多余的宽带。Vidalia 可帮助你轻松地设置中继的中继，让你也尽一份力。<a name=\"basic\"/>" + +#. type: Content of: <html><body><h3> +#: en/server.html:24 +msgid "Basic Settings" +msgstr "基本设置" + +#. type: Content of: <html><body> +#: en/server.html:26 +msgid "" +"If you decide you want to help the Tor network grow by running a relay, you " +"can follow these steps to get started:" +msgstr "如果想要运行中继来推动 Tor 网络的成长，你可以按照步骤进行：" + +#. type: Content of: <html><body><ol><li> +#: en/server.html:31 +msgid "" +"Open the Configuration Dialog by selecting Settings from the " +"tray menu or Preferences from your system menubar on Macintosh " +"systems." +msgstr "从托盘菜单选择设定或者从 Macintosh 系统中系统菜单栏选择偏好，然后打开配置对话框。" + +#. type: Content of: <html><body><ol><li> +#: en/server.html:35 +msgid "Select the Relay configuration page." +msgstr "请选择中继配置页面。" + +#. type: Content of: <html><body><ol><li> +#: en/server.html:37 +msgid "" +"Decide whether you want to run a normal Tor relay or a bridge relay " +"(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are " +"blocked from accessing the Tor network directly. Check the box labeled " +"Relay traffic for the Tor network if you want to run a normal Tor " +"relay or Help censored users reach the Tor network if you want to run" +" a bridge relay." +msgstr "请选择运行常规 Tor 中继还是网桥中继）Tor 0.2.0.8-alpha 或更高版本）。网桥中继可帮助因受到审查而被屏蔽的 Tor 用户直接访问 Tor 网络。如需运行常规 Tor 中继，请选择转发 Tor 网络流量；如需运行网桥中继，请选择帮助审查用户访问 Tor 网络。" + +#. type: Content of: <html><body><ol><li> +#: en/server.html:44 +msgid "Enter the following information:" +msgstr "请输入以下信息：" + +#. type: Content of: <html><body><ol><ul><li> +#: en/server.html:46 +msgid "" +"Nickname: The name which your relay will be known as on the Tor " +"network. An example of a relay nickname is \"MyVidaliaRelay\"." +msgstr "昵称：你的中继在 Tor 网络上显示的名称。例如，一个中继的昵称可能上 \"MyVidaliaRelay\"。" + +#. type: Content of: <html><body><ol><ul><li> +#: en/server.html:50 +msgid "" +"Contact Info: Your e-mail address. This address will only be used to " +"contact you in case there is an important Tor security update or something " +"goes wrong with your relay. You might also include your PGP or GPG key ID " +"and fingerprint." +msgstr "联系信息：你的电子邮件地址。该地址仅用于在 Tor 最大安全更新或你的中继出错的情况下与你联系。另外，还可提供你的 PGP 或 GPG 键 ID 和指纹。" + +#. type: Content of: <html><body><ol><ul><li> +#: en/server.html:56 +msgid "" +"Relay Port: The port on which your relay will listen for traffic from" +" clients or other Tor relays." +msgstr "中继端口：你的中继通过该端口侦听来自客户端或其他 Tor 中继的流量。" + +#. type: Content of: <html><body><ol><li> +#: en/server.html:62 +msgid "" +"If you would like to mirror Tor's directory of relays for others on the " +"network you can check the box labeled Mirror the Relay Directory. If" +" you do not have much bandwidth, uncheck this box. If you do decide to " +"mirror the relay directory, make sure the Directory Port is different" +" than the Relay port you entered above. Bridge relays must " +"mirror the relay directory." +msgstr "如果你想要为网络上其他中继提供 Tor 中继目录镜像，请选择提供中继目录镜像。如果没有足够的宽带，请取消选择该选项。如果确定为中继目录提供镜像，请确保目录端口与上述中继端口不同。网桥中继必须为中继目录提供镜像。" + +#. type: Content of: <html><body> +#: en/server.html:71 +msgid "<a name=\"bandwidth\"/>" +msgstr "<a name=\"bandwidth\"/>" + +#. type: Content of: <html><body><h3> +#: en/server.html:72 +msgid "Bandwidth Limits" +msgstr "带宽限制" + +#. type: Content of: <html><body> +#: en/server.html:74 +msgid "" +"Running a Tor relay can consume a large amount of bandwidth; however, Tor " +"allows you to limit the amount of bandwidth that you are willing to " +"contribute to the Tor network. You can run a relay, while still keeping your" +" network connection usable for your own use." +msgstr "运行 Tor 中继需消耗大量宽带；不过，Tor 可根据你想要为 Tor 网络贡献多少宽带而对宽带数量进行限制。你可以在运行中继的同时，保持网络连结对于自身可用。" + +#. type: Content of: <html><body> +#: en/server.html:80 +msgid "" +"You should select the option in the dropdown box that best matches your " +"connection speed. If you select Custom, you will be able to specify " +"your own limits." +msgstr "请在下拉列表中选择与你的连结速度最匹配的选项。如果选择自定义，那么可以指定你自己的范围。" + +#. type: Content of: <html><body><h4> +#: en/server.html:84 +msgid "Custom Limits" +msgstr "自定义范围" + +#. type: Content of: <html><body> +#: en/server.html:86 +msgid "" +"The maximum rate is a pool of bytes used to fulfill requests during " +"short periods of traffic higher than your specified average rate, but" +" still maintains the average over a long period. A low average rate but a " +"high maximum rate enforces a long-term average while still allowing more " +"traffic during peak times if the average hasn't been reached lately. If your" +" average rate is the same as your maximum rate, then Tor will never " +"exceed the specified rate. Your maximum rate must always be greater " +"than or equal to your average rate." +msgstr "最大速度指短期流量高于指定平均速度时可满足要求的速度，但长期来看宽带仍保持平均值。平均速度较低而最大速度较高可强制速度长期保持平均值，同时在高峰时间仍可提供更多流量。如果平均速度与最大速度相同，那么 Tor 将永远不会超过该指定速度。最大速度必须大于或等于平均速度。" + +#. type: Content of: <html><body> +#: en/server.html:96 +msgid "" +"The average rate is the maximum long-term average bandwidth allowed " +"(in kilobytes per second). For example, you might want to choose 2 megabytes" +" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable " +"connection). Tor requires a minimum of 20 kilobytes per second to run a " +"relay." +msgstr "平均速度指长期允许的平均宽带最大值（单位为 KB/s）。例如，你可以选择 2 MB/s（即 2048 KB/s）或 50 KB/s（中速网络连结）。Tor 要求运行中继的最低速度为 20 KB/s。" + +#. type: Content of: <html><body> +#: en/server.html:103 +msgid "" +"It is important to remember that Tor measures bandwidth in bytes, not" +" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For" +" example, if your relay acts as a directory mirror, you may be sending more " +"outgoing bytes than incoming. If you find this is the case and is putting " +"too much strain on your bandwidth, you should consider unchecking the " +"checkbox labeled Mirror the relay directory." +msgstr "此处需强调，Tor 的宽带计算单位为字节而非比特（bit）。另外，Tor 仅查看传入字节而非传出字节。例如，如果你的中继为目录镜像，那么传出字节可多于传入字节。如果你认为这种情况对你的宽带造成来过多压力，那么请考虑取消选择为中继目录提供镜像。" + +#. type: Content of: <html><body> +#: en/server.html:111 +msgid "<a name=\"exitpolicy\"/>" +msgstr "<a name=\"exitpolicy\"/>" + +#. type: Content of: <html><body><h3> +#: en/server.html:112 +msgid "Exit Policies" +msgstr "出口政策" + +#. type: Content of: <html><body> +#: en/server.html:114 +msgid "" +"Exit policies give you a way to specify what kinds of resources on the " +"Internet you are willing let other Tor users access from your Tor relay. " +"Tor uses a default list of exit policies that restrict some services, such " +"as mail to prevent spam and some default file sharing ports to reduce abuse " +"of the Tor network." +msgstr "出口政策为你提供了一种方式，用于指定其他 Tor 用户通过你的 Tor 中继可访问何种互联网资源。Tor 使用默认的出口政策列表来限制某些服务，如防止发送垃圾邮寄，并使用某些默认的文件共享端口来减少 Tor 网络的滥用。" + +#. type: Content of: <html><body> +#: en/server.html:121 +msgid "" +"Each of the checkboxes represents a type of resource that you can allow Tor " +"users to access through your relay. If you uncheck the box next to a " +"particular type of resource, Tor users will not be allowed to access that " +"resource from your relay. If the box labeled Misc Other Services is " +"checked, Tor users will be able to access other services not covered by the " +"other checkboxes or Tor's default exit policy." +msgstr "每个复选框表示一种可通过你的中继来访问的资源类型。如果未选中某种资源类型旁的复选框，表示不允许 Tor 用户通过你的中继访问该资源。如果选中其他服务复选框，Tor 用户可访问其他复选框或 Tor 默认出口政策未指定的其他服务。" + +#. type: Content of: <html><body> +#: en/server.html:130 +msgid "" +"For completeness, the following table lists the specific port numbers " +"represented by each of the exit policy checkboxes. The Description " +"column describes the resources Tor clients will be allowed to access through" +" your relay, if the associated box is checked." +msgstr "为了完整性，下表列出了每个出口政策复选框对应的特定端口编号。描述栏描述了选中相应复选框时你的中继允许 Tor 客户端访问的资源。" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:138 +msgid "Checkbox" +msgstr "复选框" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:139 +msgid "Ports" +msgstr "端口" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:140 +msgid "Description" +msgstr "描述" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:143 +msgid "Websites" +msgstr "网站" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:144 +msgid "80" +msgstr "80" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:145 +msgid "Normal, unencrypted Web browsing" +msgstr "常规的非加密网页浏览" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:148 +msgid "Secure Websites (SSL)" +msgstr "安全网站(SSL)" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:149 +msgid "443" +msgstr "443" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:150 +msgid "Encrypted Web browsing" +msgstr "加密网页浏览" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:153 +msgid "Retrieve Mail (POP, IMAP)" +msgstr "邮寄检索（POP、 IMAP）" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:154 +msgid "110, 143, 993, 995" +msgstr "110, 143, 993, 995" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:155 +msgid "Downloading email (does not permit sending email)" +msgstr "电子邮件下载（不允许发送电子邮件）" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:158 +msgid "Instant Messaging (IM)" +msgstr "即时消息（IM）" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:159 +msgid "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888" +msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:160 +msgid "" +"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber" +msgstr "即时消息应用程序如MSN Messenger，AIM，ICQ，和Jabber" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:163 +msgid "Internet Relay Chat (IRC)" +msgstr "互联网中继聊天（IRC）" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:164 +msgid "6660-6669, 6697, 7000-7001" +msgstr "6660-6669, 6697, 7000-7001" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:165 +msgid "IRC clients and servers" +msgstr "IRC客户端和服务器" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:168 +msgid "Misc. Other Services" +msgstr "其他服务" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:169 +msgid "*" +msgstr "*" + +#. type: Content of: <html><body><table><tr><td> +#: en/server.html:170 +msgid "All other applications that aren't covered by the previous checkboxes" +msgstr "以上复选框之外的所有其他应用" + +#. type: Content of: <html><body> +#: en/server.html:175 +msgid "" +"If you do not want to let other Tor users make connections outside the Tor " +"network from your relay, you can uncheck all of the checkboxes. Even if you " +"uncheck all of the checkboxes, your relay is still useful to the Tor " +"network. Your relay will allow other Tor users to connect to the Tor " +"network and will help relay traffic between other Tor relays." +msgstr "如果不想其他 Tor 用户通过你的中继与 Tor 网络外部建立连接，请取消选择所有复选框。即便如此，你的中继对于 Tor 网络仍是有用的，它允许其他 Tor 用户与 Tor 网络建立连接，并帮助转发其他 Tor 中继之间的流量。" + +#. type: Content of: <html><body> +#: en/server.html:182 +msgid "" +"If you chose to run a bridge relay, the Exit Policies tab will be " +"grayed out, since bridge relays do not allow exit connections. Bridges are " +"only used by Tor clients to connect to the Tor network." +msgstr "如果选择了运行网桥中继，由于桥中继不允许出口连接，出口政策选项卡将变灰。网桥仅用于 Tor 客户端连接 Tor 网络。" + +#. type: Content of: <html><body> +#: en/server.html:188 +msgid "<a name=\"upnp\"/>" +msgstr "<a name=\"upnp\"/>" + +#. type: Content of: <html><body><h3> +#: en/server.html:189 +msgid "Port Forwarding" +msgstr "端口转发" + +#. type: Content of: <html><body> +#: en/server.html:191 +msgid "" +"Many home users connect to the Internet via a router, which allows " +"multiple computers on a local network to share the same Internet connection." +" Some users may also be behind a firewall that blocks incoming " +"connections to your computer from other computers on the Internet. If you " +"want to run a Tor relay, however, other Tor clients and relays must be able " +"to connect to your relay through your home router or firewall." +msgstr "许多家庭用户通过路由器连接互联网，本地网络上的多台计算机可通过路由器共用同一互联网连接。某些用户还可能位于防火墙之内，防火墙阻止互联网的其他计算机与你的计算机建立传入连接。如果想要运行 Tor 中继，Tor 客户端和中继必须能够通过你的家庭路由器或防火墙与你的中继建立连接。" + +#. type: Content of: <html><body> +#: en/server.html:200 +msgid "" +"To make your relay publicly accessible, your router or firewall needs to " +"know which ports to allow through to your computer by setting up what is " +"known as port forwarding. Port forwarding configures your router or " +"firewall to \"forward\" all connections to certain ports on your router or " +"firewall to local ports on your computer." +msgstr "为了中继可公开访问，需通过端口映射设定让路由器或防火墙获悉允许通过哪些端口与你的计算机建立连接。端口转发可将路由器或防火墙特定端口上连接\"映射\"到计算机本地端口。" + +#. type: Content of: <html><body> +#: en/server.html:208 +msgid "" +"If you check the box labeled Attempt to automatically configure port " +"forwarding, Vidalia will attempt to automatically set up port forwarding" +" on your local network connection so that other Tor clients can connect to " +"your relay. Not all routers support automatic port forwarding, though. You " +"can use the Test button next to the checkbox to find out if Vidalia " +"is able to automatically set up port forwarding for you." +msgstr "如果选择自动配置端口映射选项，Vidalia 将自动对本地网络连接设置端口映射，以便其他 Tor 客户端能够与你的中继建立连接。并非所有路由器都支持自动端口映射。利用该复选框旁边的测试按钮可检查 Vidalia 是否能够为你自动设置端口映射。" + +#. type: Content of: <html><body> +#: en/server.html:217 +msgid "" +"If the Test button finds that Vidalia is unable to set up port " +"forwarding for you, you may need to enable this feature on your router or " +"set up port forwarding manually. Some network devices have a feature called " +"Universal Plug-and-Play (UPnP). If you can access your router's " +"administrative interface, you should look for an option to enable UPnP. The " +"administrative interface for most routers can be accessed by opening <a " +"href=\"http://192.168.0.1/\">http://192.168.0.1</a> or <a " +"href=\"http://192.168.1.1/\">http://192.168.1.1</a> in your Web browser. You" +" should consult your router's instruction manual for more information." +msgstr "如果测试按钮发现 Vidalia 无法为你设置端口映射，那么你需要在路由器上启用该功能或者手动设置端口映射。某些网络设备具有通用即插即用（UPnP）功能。如果能够范围路由器的管理界面，请找到该选项启用 UPnP。大多数路由器的管理界面可在浏览器中输入 <a href=\"http://192.168.0.1/\">http://192.168.0.1</a> 或 <a href=\"http://192.168.1.1/\">http://192.168.1.1</a> 来访问。请查询路由器用户手册获取更多信息。" + +#. type: Content of: <html><body> +#: en/server.html:229 +msgid "" +"If you need to set up port forwarding manually, the website <a " +"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\">" +" portforward.com</a> has instructions for how to set up port forwarding for " +"many types of routers and firewalls. At a minimum, you will need to forward " +"your Relay Port, which defaults to port 443 on Windows and 9001 on " +"all other operating systems. If you also checked the checkbox labeled " +"Mirror the relay directory, then you will also need to forward your " +"Directory Port. The Directory Port is set to port 9030 by " +"default on all operating systems." +msgstr "如需手动设置端口映射，请访问网站<a href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\"> portforward.com</a>，可获取有关如何在多种路由器和防火墙上设置端口映射的指南信息。你至少需要为中继端口建立映射，该端口在 Windows 上默认为 443，其他操作系统默认为 9001。如果你还选择了为中继目录提供镜像，那么还需要映射目录端口。所有操作系统的目录端口均默认设置为 9030。"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Mar '13

07 Mar '13

commit cc6f729decd9d7cefe13c3e2371989a93eb94537 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 7 03:15:29 2013 +0000 Update translations for vidalia_help --- zh_CN/server.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_CN/server.po b/zh_CN/server.po index da5abda..3a7beb0 100644 --- a/zh_CN/server.po +++ b/zh_CN/server.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-03-07 02:29+0000\n" +"PO-Revision-Date: 2013-03-07 03:10+0000\n" "Last-Translator: simabull tsai <tsaizb(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgid "" "Relay traffic for the Tor network if you want to run a normal Tor " "relay or Help censored users reach the Tor network if you want to run" " a bridge relay." -msgstr "Decide whether you want to run a normal Tor relay or a bridge relay (Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are blocked from accessing the Tor network directly. Check the box labeled Relay traffic for the Tor network if you want to run a normal Tor relay or Help censored users reach the Tor network if you want to run a bridge relay." +msgstr "请选择运行常规 Tor 中继还是网桥中继）Tor 0.2.0.8-alpha 或更高版本）。网桥中继可帮助因受到审查而被屏蔽的 Tor 用户直接访问 Tor 网络。如需运行常规 Tor 中继，请选择转发 Tor 网络流量；如需运行网桥中继，请选择帮助审查用户访问 Tor 网络。" #. type: Content of: <html><body><ol><li> #: en/server.html:44 @@ -375,7 +375,7 @@ msgid "" "your relay. Not all routers support automatic port forwarding, though. You " "can use the Test button next to the checkbox to find out if Vidalia " "is able to automatically set up port forwarding for you." -msgstr "If you check the box labeled Attempt to automatically configure port forwarding, Vidalia will attempt to automatically set up port forwarding on your local network connection so that other Tor clients can connect to your relay. Not all routers support automatic port forwarding, though. You can use the Test button next to the checkbox to find out if Vidalia is able to automatically set up port forwarding for you." +msgstr "如果选择自动配置端口映射选项，Vidalia 将自动对本地网络连接设置端口映射，以便其他 Tor 客户端能够与你的中继建立连接。并非所有路由器都支持自动端口映射。利用该复选框旁边的测试按钮可检查 Vidalia 是否能够为你自动设置端口映射。" #. type: Content of: <html><body> #: en/server.html:217 @@ -389,7 +389,7 @@ msgid "" "href=\"http://192.168.0.1/\">http://192.168.0.1</a> or <a " "href=\"http://192.168.1.1/\">http://192.168.1.1</a> in your Web browser. You" " should consult your router's instruction manual for more information." -msgstr "" +msgstr "如果测试按钮发现 Vidalia 无法为你设置端口映射，那么你需要在路由器上启用该功能或者手动设置端口映射。某些网络设备具有通用即插即用（UPnP）功能。如果能够范围路由器的管理界面，请找到该选项启用 UPnP。大多数路由器的管理界面可在浏览器中输入 <a href=\"http://192.168.0.1/\">http://192.168.0.1</a> 或 <a href=\"http://192.168.1.1/\">http://192.168.1.1</a> 来访问。请查询路由器用户手册获取更多信息。" #. type: Content of: <html><body> #: en/server.html:229 @@ -403,4 +403,4 @@ msgid "" "Mirror the relay directory, then you will also need to forward your " "Directory Port. The Directory Port is set to port 9030 by " "default on all operating systems." -msgstr "" +msgstr "如需手动设置端口映射，请访问网站<a href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\"> portforward.com</a>，可获取有关如何在多种路由器和防火墙上设置端口映射的指南信息。你至少需要为中继端口建立映射，该端口在 Windows 上默认为 443，其他操作系统默认为 9001。如果你还选择了为中继目录提供镜像，那么还需要映射目录端口。所有操作系统的目录端口均默认设置为 9030。"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Mar '13

07 Mar '13

commit 9d4a5dd6f9e34fe0aa93f226f2af031c20b865fb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 7 02:45:29 2013 +0000 Update translations for vidalia_help --- zh_CN/server.po | 82 +++++++++++++++++++++++++++--------------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/zh_CN/server.po b/zh_CN/server.po index 988963c..da5abda 100644 --- a/zh_CN/server.po +++ b/zh_CN/server.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-06-24 10:50+0000\n" -"Last-Translator: Curtis Stone <cstone(a)fastmail.cn>\n" +"PO-Revision-Date: 2013-03-07 02:29+0000\n" +"Last-Translator: simabull tsai <tsaizb(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #. type: Content of: <html><body><h1> #: en/server.html:16 msgid "Setting Up a Tor Relay" -msgstr "" +msgstr "设置 Tor 中继" #. type: Content of: <html><body> #: en/server.html:19 @@ -28,7 +28,7 @@ msgid "" "The Tor network is made up of volunteers all over the world who donate some " "of their spare bandwidth by running a Tor relay. Vidalia helps you do your " "part by making it easy to set up a relay of your own. <a name=\"basic\"/>" -msgstr "" +msgstr "Tor 网络由世界各地的志愿者组成，这些人通过运行 Tor 中继来贡献一部分他们多余的宽带。Vidalia 可帮助你轻松地设置中继的中继，让你也尽一份力。<a name=\"basic\"/>" #. type: Content of: <html><body><h3> #: en/server.html:24 @@ -40,7 +40,7 @@ msgstr "基本设置" msgid "" "If you decide you want to help the Tor network grow by running a relay, you " "can follow these steps to get started:" -msgstr "" +msgstr "如果想要运行中继来推动 Tor 网络的成长，你可以按照步骤进行：" #. type: Content of: <html><body><ol><li> #: en/server.html:31 @@ -48,12 +48,12 @@ msgid "" "Open the Configuration Dialog by selecting Settings from the " "tray menu or Preferences from your system menubar on Macintosh " "systems." -msgstr "" +msgstr "从托盘菜单选择设定或者从 Macintosh 系统中系统菜单栏选择偏好，然后打开配置对话框。" #. type: Content of: <html><body><ol><li> #: en/server.html:35 msgid "Select the Relay configuration page." -msgstr "" +msgstr "请选择中继配置页面。" #. type: Content of: <html><body><ol><li> #: en/server.html:37 @@ -64,19 +64,19 @@ msgid "" "Relay traffic for the Tor network if you want to run a normal Tor " "relay or Help censored users reach the Tor network if you want to run" " a bridge relay." -msgstr "" +msgstr "Decide whether you want to run a normal Tor relay or a bridge relay (Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are blocked from accessing the Tor network directly. Check the box labeled Relay traffic for the Tor network if you want to run a normal Tor relay or Help censored users reach the Tor network if you want to run a bridge relay." #. type: Content of: <html><body><ol><li> #: en/server.html:44 msgid "Enter the following information:" -msgstr "" +msgstr "请输入以下信息：" #. type: Content of: <html><body><ol><ul><li> #: en/server.html:46 msgid "" "Nickname: The name which your relay will be known as on the Tor " "network. An example of a relay nickname is \"MyVidaliaRelay\"." -msgstr "" +msgstr "昵称：你的中继在 Tor 网络上显示的名称。例如，一个中继的昵称可能上 \"MyVidaliaRelay\"。" #. type: Content of: <html><body><ol><ul><li> #: en/server.html:50 @@ -85,14 +85,14 @@ msgid "" "contact you in case there is an important Tor security update or something " "goes wrong with your relay. You might also include your PGP or GPG key ID " "and fingerprint." -msgstr "" +msgstr "联系信息：你的电子邮件地址。该地址仅用于在 Tor 最大安全更新或你的中继出错的情况下与你联系。另外，还可提供你的 PGP 或 GPG 键 ID 和指纹。" #. type: Content of: <html><body><ol><ul><li> #: en/server.html:56 msgid "" "Relay Port: The port on which your relay will listen for traffic from" " clients or other Tor relays." -msgstr "" +msgstr "中继端口：你的中继通过该端口侦听来自客户端或其他 Tor 中继的流量。" #. type: Content of: <html><body><ol><li> #: en/server.html:62 @@ -103,12 +103,12 @@ msgid "" "mirror the relay directory, make sure the Directory Port is different" " than the Relay port you entered above. Bridge relays must " "mirror the relay directory." -msgstr "" +msgstr "如果你想要为网络上其他中继提供 Tor 中继目录镜像，请选择提供中继目录镜像。如果没有足够的宽带，请取消选择该选项。如果确定为中继目录提供镜像，请确保目录端口与上述中继端口不同。网桥中继必须为中继目录提供镜像。" #. type: Content of: <html><body> #: en/server.html:71 msgid "<a name=\"bandwidth\"/>" -msgstr "" +msgstr "<a name=\"bandwidth\"/>" #. type: Content of: <html><body><h3> #: en/server.html:72 @@ -122,7 +122,7 @@ msgid "" "allows you to limit the amount of bandwidth that you are willing to " "contribute to the Tor network. You can run a relay, while still keeping your" " network connection usable for your own use." -msgstr "" +msgstr "运行 Tor 中继需消耗大量宽带；不过，Tor 可根据你想要为 Tor 网络贡献多少宽带而对宽带数量进行限制。你可以在运行中继的同时，保持网络连结对于自身可用。" #. type: Content of: <html><body> #: en/server.html:80 @@ -130,12 +130,12 @@ msgid "" "You should select the option in the dropdown box that best matches your " "connection speed. If you select Custom, you will be able to specify " "your own limits." -msgstr "" +msgstr "请在下拉列表中选择与你的连结速度最匹配的选项。如果选择自定义，那么可以指定你自己的范围。" #. type: Content of: <html><body><h4> #: en/server.html:84 msgid "Custom Limits" -msgstr "" +msgstr "自定义范围" #. type: Content of: <html><body> #: en/server.html:86 @@ -148,7 +148,7 @@ msgid "" " average rate is the same as your maximum rate, then Tor will never " "exceed the specified rate. Your maximum rate must always be greater " "than or equal to your average rate." -msgstr "" +msgstr "最大速度指短期流量高于指定平均速度时可满足要求的速度，但长期来看宽带仍保持平均值。平均速度较低而最大速度较高可强制速度长期保持平均值，同时在高峰时间仍可提供更多流量。如果平均速度与最大速度相同，那么 Tor 将永远不会超过该指定速度。最大速度必须大于或等于平均速度。" #. type: Content of: <html><body> #: en/server.html:96 @@ -158,7 +158,7 @@ msgid "" " per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable " "connection). Tor requires a minimum of 20 kilobytes per second to run a " "relay." -msgstr "" +msgstr "平均速度指长期允许的平均宽带最大值（单位为 KB/s）。例如，你可以选择 2 MB/s（即 2048 KB/s）或 50 KB/s（中速网络连结）。Tor 要求运行中继的最低速度为 20 KB/s。" #. type: Content of: <html><body> #: en/server.html:103 @@ -169,17 +169,17 @@ msgid "" "outgoing bytes than incoming. If you find this is the case and is putting " "too much strain on your bandwidth, you should consider unchecking the " "checkbox labeled Mirror the relay directory." -msgstr "" +msgstr "此处需强调，Tor 的宽带计算单位为字节而非比特（bit）。另外，Tor 仅查看传入字节而非传出字节。例如，如果你的中继为目录镜像，那么传出字节可多于传入字节。如果你认为这种情况对你的宽带造成来过多压力，那么请考虑取消选择为中继目录提供镜像。" #. type: Content of: <html><body> #: en/server.html:111 msgid "<a name=\"exitpolicy\"/>" -msgstr "" +msgstr "<a name=\"exitpolicy\"/>" #. type: Content of: <html><body><h3> #: en/server.html:112 msgid "Exit Policies" -msgstr "" +msgstr "出口政策" #. type: Content of: <html><body> #: en/server.html:114 @@ -189,7 +189,7 @@ msgid "" "Tor uses a default list of exit policies that restrict some services, such " "as mail to prevent spam and some default file sharing ports to reduce abuse " "of the Tor network." -msgstr "" +msgstr "出口政策为你提供了一种方式，用于指定其他 Tor 用户通过你的 Tor 中继可访问何种互联网资源。Tor 使用默认的出口政策列表来限制某些服务，如防止发送垃圾邮寄，并使用某些默认的文件共享端口来减少 Tor 网络的滥用。" #. type: Content of: <html><body> #: en/server.html:121 @@ -200,7 +200,7 @@ msgid "" "resource from your relay. If the box labeled Misc Other Services is " "checked, Tor users will be able to access other services not covered by the " "other checkboxes or Tor's default exit policy." -msgstr "" +msgstr "每个复选框表示一种可通过你的中继来访问的资源类型。如果未选中某种资源类型旁的复选框，表示不允许 Tor 用户通过你的中继访问该资源。如果选中其他服务复选框，Tor 用户可访问其他复选框或 Tor 默认出口政策未指定的其他服务。" #. type: Content of: <html><body> #: en/server.html:130 @@ -209,27 +209,27 @@ msgid "" "represented by each of the exit policy checkboxes. The Description " "column describes the resources Tor clients will be allowed to access through" " your relay, if the associated box is checked." -msgstr "" +msgstr "为了完整性，下表列出了每个出口政策复选框对应的特定端口编号。描述栏描述了选中相应复选框时你的中继允许 Tor 客户端访问的资源。" #. type: Content of: <html><body><table><tr><td> #: en/server.html:138 msgid "Checkbox" -msgstr "" +msgstr "复选框" #. type: Content of: <html><body><table><tr><td> #: en/server.html:139 msgid "Ports" -msgstr "" +msgstr "端口" #. type: Content of: <html><body><table><tr><td> #: en/server.html:140 msgid "Description" -msgstr "" +msgstr "描述" #. type: Content of: <html><body><table><tr><td> #: en/server.html:143 msgid "Websites" -msgstr "" +msgstr "网站" #. type: Content of: <html><body><table><tr><td> #: en/server.html:144 @@ -239,7 +239,7 @@ msgstr "80" #. type: Content of: <html><body><table><tr><td> #: en/server.html:145 msgid "Normal, unencrypted Web browsing" -msgstr "" +msgstr "常规的非加密网页浏览" #. type: Content of: <html><body><table><tr><td> #: en/server.html:148 @@ -259,7 +259,7 @@ msgstr "加密网页浏览" #. type: Content of: <html><body><table><tr><td> #: en/server.html:153 msgid "Retrieve Mail (POP, IMAP)" -msgstr "" +msgstr "邮寄检索（POP、 IMAP）" #. type: Content of: <html><body><table><tr><td> #: en/server.html:154 @@ -269,7 +269,7 @@ msgstr "110, 143, 993, 995" #. type: Content of: <html><body><table><tr><td> #: en/server.html:155 msgid "Downloading email (does not permit sending email)" -msgstr "" +msgstr "电子邮件下载（不允许发送电子邮件）" #. type: Content of: <html><body><table><tr><td> #: en/server.html:158 @@ -305,7 +305,7 @@ msgstr "IRC客户端和服务器" #. type: Content of: <html><body><table><tr><td> #: en/server.html:168 msgid "Misc. Other Services" -msgstr "" +msgstr "其他服务" #. type: Content of: <html><body><table><tr><td> #: en/server.html:169 @@ -315,7 +315,7 @@ msgstr "*" #. type: Content of: <html><body><table><tr><td> #: en/server.html:170 msgid "All other applications that aren't covered by the previous checkboxes" -msgstr "" +msgstr "以上复选框之外的所有其他应用" #. type: Content of: <html><body> #: en/server.html:175 @@ -325,7 +325,7 @@ msgid "" "uncheck all of the checkboxes, your relay is still useful to the Tor " "network. Your relay will allow other Tor users to connect to the Tor " "network and will help relay traffic between other Tor relays." -msgstr "" +msgstr "如果不想其他 Tor 用户通过你的中继与 Tor 网络外部建立连接，请取消选择所有复选框。即便如此，你的中继对于 Tor 网络仍是有用的，它允许其他 Tor 用户与 Tor 网络建立连接，并帮助转发其他 Tor 中继之间的流量。" #. type: Content of: <html><body> #: en/server.html:182 @@ -333,12 +333,12 @@ msgid "" "If you chose to run a bridge relay, the Exit Policies tab will be " "grayed out, since bridge relays do not allow exit connections. Bridges are " "only used by Tor clients to connect to the Tor network." -msgstr "" +msgstr "如果选择了运行网桥中继，由于桥中继不允许出口连接，出口政策选项卡将变灰。网桥仅用于 Tor 客户端连接 Tor 网络。" #. type: Content of: <html><body> #: en/server.html:188 msgid "<a name=\"upnp\"/>" -msgstr "" +msgstr "<a name=\"upnp\"/>" #. type: Content of: <html><body><h3> #: en/server.html:189 @@ -354,7 +354,7 @@ msgid "" "connections to your computer from other computers on the Internet. If you " "want to run a Tor relay, however, other Tor clients and relays must be able " "to connect to your relay through your home router or firewall." -msgstr "" +msgstr "许多家庭用户通过路由器连接互联网，本地网络上的多台计算机可通过路由器共用同一互联网连接。某些用户还可能位于防火墙之内，防火墙阻止互联网的其他计算机与你的计算机建立传入连接。如果想要运行 Tor 中继，Tor 客户端和中继必须能够通过你的家庭路由器或防火墙与你的中继建立连接。" #. type: Content of: <html><body> #: en/server.html:200 @@ -364,7 +364,7 @@ msgid "" "known as port forwarding. Port forwarding configures your router or " "firewall to \"forward\" all connections to certain ports on your router or " "firewall to local ports on your computer." -msgstr "" +msgstr "为了中继可公开访问，需通过端口映射设定让路由器或防火墙获悉允许通过哪些端口与你的计算机建立连接。端口转发可将路由器或防火墙特定端口上连接\"映射\"到计算机本地端口。" #. type: Content of: <html><body> #: en/server.html:208 @@ -375,7 +375,7 @@ msgid "" "your relay. Not all routers support automatic port forwarding, though. You " "can use the Test button next to the checkbox to find out if Vidalia " "is able to automatically set up port forwarding for you." -msgstr "" +msgstr "If you check the box labeled Attempt to automatically configure port forwarding, Vidalia will attempt to automatically set up port forwarding on your local network connection so that other Tor clients can connect to your relay. Not all routers support automatic port forwarding, though. You can use the Test button next to the checkbox to find out if Vidalia is able to automatically set up port forwarding for you." #. type: Content of: <html><body> #: en/server.html:217

1 0

[flashproxy/master] Put the "apt-get upgrade" in the browser bundle section.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit 1c13f037208f72a4e42b637aaa7f88dabd7f22c2 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 18:15:32 2013 -0800 Put the "apt-get upgrade" in the browser bundle section. --- doc/bundle-gnulinux.txt | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index c56c84a..5b7f290 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -62,8 +62,6 @@ Choose "Install" when it boots. Here are settings: Packages to install: - $ sudo apt-get update - $ sudo apt-get upgrade $ sudo apt-get install --no-install-recommends git make python-m2crypto zip $ sudo apt-get install --no-install-recommends python-setuptools python-crypto python-twisted python-argparse @@ -89,6 +87,11 @@ Clone pyobfsproxy. $ cd pyobfsproxy $ git checkout pyobfsproxy-0.0.2 +Update your Debian. + + $ sudo apt-get update + $ sudo apt-get upgrade + Within the VM, download the 32-bit or 64-bit browser bundle from https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserb…. The instructions below are for the 32-bit (i686) version.

1 0

[torbutton/master] Bug #8422: Clear DOM localStorage on New Identity.
by mikeperry＠torproject.org 07 Mar '13

07 Mar '13

commit 80ec753926e1bcb9aa73787cbada0841f38fd66d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 6 17:54:13 2013 -0800 Bug #8422: Clear DOM localStorage on New Identity. Also emit a private browsing session clearing event for good measure. --- src/chrome/content/torbutton.js | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2062e4d..e762402 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1307,6 +1307,8 @@ function torbutton_new_identity() { * * XXX: intermediate SSL certificates are not cleared. */ +// XXX: Test urls: +// http://www.stevesouders.com/blog/2012/09/10/clearing-browser-data/ // Bug 1506 P4: Needed for New Identity. function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Disabling JS"); @@ -1416,10 +1418,31 @@ function torbutton_do_new_identity() { torbutton_log(4, "Exception on image cache clearing: "+e); } - torbutton_log(3, "New Identity: Clearing Disk Cache"); + torbutton_log(3, "New Identity: Clearing Offline Cache"); var cache = Components.classes["@mozilla.org/network/cache-service;1"]. getService(Components.interfaces.nsICacheService); + + try { + cache.evictEntries(Ci.nsICache.STORE_OFFLINE); + } catch(e) { + torbutton_log(5, "Exception on cache clearing: "+e); + window.alert("Torbutton: Unexpected error during offline cache clearing: "+e); + } + + torbutton_log(3, "New Identity: Clearing LocalStorage"); + + try { + var storageManagerService = Cc["@mozilla.org/dom/storagemanager;1"]. + getService(Ci.nsIDOMStorageManager); + storageManagerService.clearOfflineApps(); + } catch(e) { + torbutton_log(5, "Exception on localStorage clearing: "+e); + window.alert("Torbutton: Unexpected error during localStorage clearing: "+e); + } + + torbutton_log(3, "New Identity: Clearing Disk Cache"); + try { cache.evictEntries(0); } catch(e) { @@ -1445,6 +1468,9 @@ function torbutton_do_new_identity() { // Clear keep-alive var obsSvc = Components.classes["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService); obsSvc.notifyObservers(this, "net:prune-all-connections", null); + + torbutton_log(3, "New Identity: Emitting Private Browsing Session clear event"); + obsSvc.notifyObservers(null, "browser:purge-session-history", ""); torbutton_log(3, "New Identity: Clearing Content Preferences");

1 0

[torbutton/master] Bug 8382: Leave IndexedDB and Offline Storage disabled.
by mikeperry＠torproject.org 07 Mar '13

07 Mar '13

commit 640dce2e2adf15a76da7f8cc798f7c59ac9ca309 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 6 17:56:28 2013 -0800 Bug 8382: Leave IndexedDB and Offline Storage disabled. Offline Storage can be used as a third party tracking vector, and IndexedDB seems impossible to clear during New Identity. --- src/chrome/content/torbutton.js | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index e762402..55eb2bf 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1535,12 +1535,14 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setBoolPref("browser.privatebrowsing.autostart", mode); m_tb_prefs.setBoolPref("browser.cache.disk.enable", !mode); - m_tb_prefs.setBoolPref("dom.indexedDB.enabled", !mode); + + // No way to clear this beast during New Identity. Leave it off. + //m_tb_prefs.setBoolPref("dom.indexedDB.enabled", !mode); if (m_tb_tbb) m_tb_prefs.setBoolPref("permissions.memory_only", mode); - // XXX: Third party abuse? - m_tb_prefs.setBoolPref("browser.cache.offline.enable", !mode); + // Third party abuse. Leave it off for now. + //m_tb_prefs.setBoolPref("browser.cache.offline.enable", !mode); if (mode) { m_tb_prefs.setIntPref("network.cookie.lifetimePolicy", 2);

1 0