- tor-commits - lists.torproject.org

[tor/master] Give DirAllowPrivateAddress an explicit default
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit f78fc8cfb4de9dac3d806c22fc577c8103df2420 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:04:18 2011 -0500 Give DirAllowPrivateAddress an explicit default By convention, we say whether each bool's default is 0 or 1 Fixes 4536; found by "troll_un" --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 525ff16..073b44d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -232,7 +232,7 @@ static config_var_t _option_vars[] = { V(DataDirectory, FILENAME, NULL), OBSOLETE("DebugLogFile"), V(DisableNetwork, BOOL, "0"), - V(DirAllowPrivateAddresses, BOOL, NULL), + V(DirAllowPrivateAddresses, BOOL, "0"), V(TestingAuthDirTimeToLearnReachability, INTERVAL, "30 minutes"), V(DirListenAddress, LINELIST, NULL), OBSOLETE("DirFetchPeriod"),

1 0

[tor/master] Resolve bug 3448: remove mention of tor-ops (which is not in use)
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit cf14a520c87c7a98c1ab351b476f46b69e7be75d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 15:42:15 2011 -0500 Resolve bug 3448: remove mention of tor-ops (which is not in use) --- changes/bug3448 | 3 +++ src/or/connection.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/bug3448 b/changes/bug3448 new file mode 100644 index 0000000..6e7d4b4 --- /dev/null +++ b/changes/bug3448 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix a log message suggesting that people contact a non-existent + email address. Fix for bug 3448. diff --git a/src/or/connection.c b/src/or/connection.c index 7b95aca..28d8bca 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3137,8 +3137,7 @@ connection_handle_write_impl(connection_t *conn, int force) /* Sometimes, "writable" means "connected". */ if (connection_state_is_connecting(conn)) { if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) { - log_warn(LD_BUG, - "getsockopt() syscall failed?! Please report to tor-ops."); + log_warn(LD_BUG, "getsockopt() syscall failed"); if (CONN_IS_EDGE(conn)) connection_edge_end_errno(TO_EDGE_CONN(conn)); connection_mark_for_close(conn);

1 0

[tor/master] Fix bug 4530; check return val of tor_addr_lookup correctly
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit b7015603fa014c91056fa46cb012976a9e166cd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 15:37:24 2011 -0500 Fix bug 4530; check return val of tor_addr_lookup correctly Fix on 0.2.1.5-alpha; reported by troll_un --- changes/bug4530 | 6 ++++++ src/common/address.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug4530 b/changes/bug4530 new file mode 100644 index 0000000..7cd4726 --- /dev/null +++ b/changes/bug4530 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Correctly detect and handle transient lookup failures from + tor_addr_lookup. Fixes bug 4530; bugfix on 0.2.1.5-alpha. + Reported by "troll_un". + diff --git a/src/common/address.c b/src/common/address.c index 46ccb1f..17bdea9 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1034,7 +1034,7 @@ tor_addr_port_parse(const char *s, tor_addr_t *addr_out, uint16_t *port_out) ++port; } - if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) < 0) + if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) != 0) goto err; tor_free(tmp);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 0920cd02f4c49b64d30879b18c4287384a36d9f1 Merge: cd10013 b701560 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 15:38:29 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4530 | 6 ++++++ src/common/address.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Fix bug 4530; check return val of tor_addr_lookup correctly
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit b7015603fa014c91056fa46cb012976a9e166cd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 15:37:24 2011 -0500 Fix bug 4530; check return val of tor_addr_lookup correctly Fix on 0.2.1.5-alpha; reported by troll_un --- changes/bug4530 | 6 ++++++ src/common/address.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug4530 b/changes/bug4530 new file mode 100644 index 0000000..7cd4726 --- /dev/null +++ b/changes/bug4530 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Correctly detect and handle transient lookup failures from + tor_addr_lookup. Fixes bug 4530; bugfix on 0.2.1.5-alpha. + Reported by "troll_un". + diff --git a/src/common/address.c b/src/common/address.c index 46ccb1f..17bdea9 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1034,7 +1034,7 @@ tor_addr_port_parse(const char *s, tor_addr_t *addr_out, uint16_t *port_out) ++port; } - if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) < 0) + if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) != 0) goto err; tor_free(tmp);

1 0

r25242: {website} add the latest press interviews and stories. (website/trunk/press/en)
by Andrew Lewman 02 Dec '11

02 Dec '11

Author: phobos Date: 2011-12-02 18:48:55 +0000 (Fri, 02 Dec 2011) New Revision: 25242 Modified: website/trunk/press/en/inthemedia.wml Log: add the latest press interviews and stories. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2011-12-02 07:52:49 UTC (rev 25241) +++ website/trunk/press/en/inthemedia.wml 2011-12-02 18:48:55 UTC (rev 25242) @@ -33,15 +33,35 @@ </tr> </thead> <tr style="background-color: #e5e5e5;"> +<td>2011 Dec 01</td> +<td>itbusiness.ca</td> +<td><a href="http://www.itbusiness.ca/it/client/en/home/news.asp?id=65170">Convenience technology threatening personal privacy, experts say</a></td> +</tr> +<tr> +<td>2011 Nov 21</td> +<td>Spiegel Online</td> +<td><a href="http://www.spiegel.de/netzwelt/web/0,1518,798977,00.html">Chinas Internet-Zensoren testen neue Filter</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> +<td>2011 Nov 20</td> +<td>China Digital Times</td> +<td><a href="http://chinadigitaltimes.net/2011/11/government-blocks-encrypted-tunnels-th…">Government Blocks Encrypted Tunnels Through Great Firewall; Fang Binxing Talks Internet Sovereignty</a></td> +</tr> +<tr> <td>2011 Nov 23</td> <td>IT Security Belgium</td> <td><a href="http://www.itsecurity.be/tor-project-is-tapping-amazons-ec2-cloud-service">Tor Project is tapping Amazon’s EC2 cloud service</a></td> </tr> -<tr> +<tr style="background-color: #e5e5e5;"> <td>2011 Nov 22</td> <td>Boing Boing</td> <td><a href="http://boingboing.net/2011/11/22/tor-project-asks-supporters-to.html">Tor project asks supporters to set up virtual Tor bridges in Amazon's cloud</a></td> </tr> +<tr> +<td>2011 Nov 18</td> +<td>Dagens IT</td> +<td><a href="http://www.dagensit.no/article2272736.ece">Tetter hullene i den kinesiske internett-muren</a></td> +</tr> <tr style="background-color: #e5e5e5;"> <td>2011 Nov 16</td> <td>Forbes</td>

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 02 Dec '11

02 Dec '11

commit fefaca7c1790e2e7346f86a4036e5a3e750298dd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 2 13:15:27 2011 +0000 Update translations for vidalia --- zh_CN/vidalia_zh_CN.po | 51 +++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index 51c5652..861920d 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -1,5 +1,6 @@ # # Translators: +# Kevin Chen <szescxz(a)126.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. # <szescxz(a)126.com>, 2011. msgid "" @@ -7,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: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-11-29 11:58+0000\n" +"PO-Revision-Date: 2011-12-02 13:11+0000\n" "Last-Translator: szescxz <szescxz(a)126.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3107,7 +3108,7 @@ msgstr "<a href=\"#bridgeHelp\">这是什么？</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "自动发布我的网桥地址" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3225,6 +3226,7 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"单击位于 Vidalia 控制面板的“启动 Tor”以重启 Tor 软件。如果 Tor 意外退出，选中顶端的“高级”选项卡以查看所遇到的错误的信息。" msgctxt "StatusEventWidget" msgid "" @@ -3232,7 +3234,7 @@ msgid "" "longer recommended. Please upgrade to the most recent version of the " "software, which may contain important security, reliability and performance " "fixes." -msgstr "" +msgstr "您正在运行版本为 %1 的 Tor 软件，且此版本已经不再推荐使用。请升级到最新的版本，它可以提升重要的安全性、可靠性与性能。" msgctxt "StatusEventWidget" msgid "" @@ -3241,6 +3243,7 @@ msgid "" "version of the software, which may contain important security, reliability " "and performance fixes." msgstr "" +"您正在运行版本为 %1 的 Tor 软件，且此版本已不再支持现在的 Tor 网络。请升级到最新的版本，它可以提升重要的安全性、可靠性与性能。" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" @@ -3254,7 +3257,7 @@ msgctxt "StatusEventWidget" msgid "" "We were able to successfully establish a connection to the Tor network. You " "can now configure your applications to use the Internet anonymously." -msgstr "" +msgstr "我们已成功创建一个到 Tor 网络的连接。您可以现在配置您的应用程序以匿名方式访问互联网。" msgctxt "StatusEventWidget" msgid "Tor Software Error" @@ -3264,7 +3267,7 @@ msgctxt "StatusEventWidget" msgid "" "The Tor software encountered an internal bug. Please report the following " "error message to the Tor developers at bugs.torproject.org: \"%1\"" -msgstr "" +msgstr "Tor 软件遇到了一个内部错误。请将下列错误信息通过 bugs.torproject.org 发送给 Tor 的开发者：“%1”" msgctxt "StatusEventWidget" msgid "" @@ -3284,7 +3287,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "您的计算机的时钟可能不正确" msgctxt "StatusEventWidget" msgid "" @@ -3303,7 +3306,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" -msgstr "" +msgstr "含有潜在危险的连接！" msgctxt "StatusEventWidget" msgid "" @@ -3315,7 +3318,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "未知 SOCKS 协议" msgctxt "StatusEventWidget" msgid "" @@ -3326,7 +3329,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" -msgstr "" +msgstr "错误目标主机名" msgctxt "StatusEventWidget" msgid "" @@ -3337,7 +3340,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "外部 IP 地址已改变" msgctxt "StatusEventWidget" msgid "" @@ -3348,7 +3351,7 @@ msgstr "Tor已确定您的中继的当前公共IP地址是 %1%2。如果这不 msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "检测到 DNS 劫持" msgctxt "StatusEventWidget" msgid "" @@ -3366,7 +3369,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "" +msgstr "正在检测服务器端口的连接性" msgctxt "StatusEventWidget" msgid "" @@ -3377,7 +3380,7 @@ msgstr "Tor正在尝试确定Tor网络可以连接到您的服务器端口 %1:%2 msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "" +msgstr "服务器端口连接性测试成功！" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" @@ -3385,7 +3388,7 @@ msgstr "Tor网络可以连接到您的中继服务器的端口！" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "" +msgstr "服务器端口连接性测试失败" msgctxt "StatusEventWidget" msgid "" @@ -3502,45 +3505,45 @@ msgstr "密码指纹生成失败。" msgctxt "TorrcDialog" msgid "Editing torrc" -msgstr "" +msgstr "正在编辑 torrc" msgctxt "TorrcDialog" msgid "" "Save settings. If unchecked it will only apply settings to the current Tor " "instance." -msgstr "" +msgstr "保存设置。若取消勾选将只在本次 Tor 运行时生效。" msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "剪切" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "复制" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "粘贴" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "撤销" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "重做" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "全部选定" msgctxt "TorrcDialog" msgid "Apply all" -msgstr "" +msgstr "全部接受" msgctxt "TorrcDialog" msgid "Apply selection only" -msgstr "" +msgstr "只接受选定项" msgctxt "TorrcDialog" msgid "Error connecting to Tor"

1 0

[torflow/master] Actually, we should be using min(circ_error, pid_error).
by mikeperry＠torproject.org 02 Dec '11

02 Dec '11

commit 3be33faf271d378fddc4a048538703cf16ffd586 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Dec 2 01:20:17 2011 -0800 Actually, we should be using min(circ_error,pid_error). --- NetworkScanners/BwAuthority/README.spec.txt | 3 ++- NetworkScanners/BwAuthority/aggregate.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index d223160..ddaa7cc 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -517,7 +517,8 @@ respectively. If this error value is negative (meaning the node is failing - more circuits than the network average), we use it as the + more circuits than the network average), we use the smaller + of the circ_error and the original pid_error as the new pid_error. "bwauthbestratio=0" diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index ae6f5be..884b065 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -549,7 +549,7 @@ def main(argv): # FIXME: Hrmm, should we only penalize for circ fails, or should # we reward, too? if circ_error < 0: - n.pid_error = circ_error + n.pid_error = min(circ_error,n.pid_error) if n.idhex in prev_votes.vote_map: # If there is a new sample, let's use it for all but guards

1 0

r25241: {website} bring the bridge explanation partway out of the stone age (website/trunk/docs/en)
by Roger Dingledine 02 Dec '11

02 Dec '11

Author: arma Date: 2011-12-02 07:52:49 +0000 (Fri, 02 Dec 2011) New Revision: 25241 Modified: website/trunk/docs/en/bridges.wml Log: bring the bridge explanation partway out of the stone age Modified: website/trunk/docs/en/bridges.wml =================================================================== --- website/trunk/docs/en/bridges.wml 2011-12-02 07:50:12 UTC (rev 25240) +++ website/trunk/docs/en/bridges.wml 2011-12-02 07:52:49 UTC (rev 25241) @@ -25,11 +25,7 @@ <p> The addition of bridges to Tor is a step forward in the blocking resistance race. It is perfectly possible that even if your ISP filters - the Internet, you do not require a bridge to use Tor. Many filtering - programs look for unencrypted Tor directory requests to recognize that - you're using Tor, but Tor version 0.2.0.23-rc and later use encrypted - directory queries by default. This change means that most filtering - programs are now unable to recognize Tor connections. So you should try + the Internet, you do not require a bridge to use Tor. So you should try to use Tor without bridges first, since it might work. </p> @@ -42,8 +38,8 @@ FAQ about problems with running Tor properly</a> when you have issues. If you feel that the issue is clearly blocking, or you'd simply like to try because you're unsure or feeling adventurous, please read on. Ensure - that you're using the <a href="<page download/download>#Dev">latest 0.2.1.x or - 0.2.2.x bundle for your platform</a>. + that you're using the <a href="<page download/download>#Dev">latest 0.2.2.x or + 0.2.3.x bundle for your platform</a>. </p> <p> @@ -207,3 +203,4 @@ </div>  #include <foot.wmi> +

1 0

r25240: {website} Fixed link to Sponsor TODO list (website/trunk/docs/en)
by Runa Sandvik 02 Dec '11

02 Dec '11

Author: runa Date: 2011-12-02 07:50:12 +0000 (Fri, 02 Dec 2011) New Revision: 25240 Modified: website/trunk/docs/en/documentation.wml Log: Fixed link to Sponsor TODO list Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2011-12-01 04:51:48 UTC (rev 25239) +++ website/trunk/docs/en/documentation.wml 2011-12-02 07:50:12 UTC (rev 25240) @@ -145,7 +145,7 @@ <li> Our <a - href="https://trac.torproject.org/projects/tor/wiki/sponsors">sponsor TODO list</a> starts with a + href="https://trac.torproject.org/projects/tor/wiki/org/sponsors">sponsor TODO list</a> starts with a timeline for external promises — things <a href="<page about/sponsors>">our sponsors</a> have paid to see done. It also lists many other tasks and topics we'd like to tackle next.

1 0