[tor-commits] r26607: {website} put new tbb on frontpage (website/trunk/en)
Author: arma Date: 2014-02-11 08:20:11 + (Tue, 11 Feb 2014) New Revision: 26607 Modified: website/trunk/en/index.wml Log: put new tbb on frontpage Modified: website/trunk/en/index.wml === --- website/trunk/en/index.wml 2014-02-11 03:08:54 UTC (rev 26606) +++ website/trunk/en/index.wml 2014-02-11 08:20:11 UTC (rev 26607) @@ -158,8 +158,8 @@ table tr td -div class=calendarspan class=monthJan/spanbrspan class=day27/span/div - pTor Browser Bundle 3.5.1 Released. Read the a href=https://blog.torproject.org/blog/tor-browser-351-released;release notice/a. Please see the a href=https://www.torproject.org/docs/faq.html.en#TBBFlash;FAQ listing/a before contacting support or filing tickets./p +div class=calendarspan class=monthFeb/spanbrspan class=day10/span/div + pTor Browser Bundle 3.5.2 Released. Read the a href=https://blog.torproject.org/blog/tor-browser-352-released;release notice/a. Please see the a href=https://trac.torproject.org/projects/tor/wiki/doc/TorBrowserBundle3FAQ;transition FAQ/a before contacting support or filing tickets./p /td /tr tr ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bug 10858: Fix error in TBB 3.5.1's changelog
commit 7157aac5638432570d14dcd385e144a44ef2c4bf Author: Georg Koppen g...@torproject.org Date: Tue Feb 11 09:41:35 2014 +0100 Bug 10858: Fix error in TBB 3.5.1's changelog Change the changelog to match the corrected version on https://blog.torproject.org. --- Bundle-Data/Docs/ChangeLog.txt |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2a8c15d..dfa7e1d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -20,11 +20,12 @@ Tor Browser Bundle 3.5.1 -- Jan 22 2014 * All Platforms * Bug 10447: Remove SocksListenAddress to allow multiple socks ports. * Bug 10464: Remove addons.mozilla.org from NoScript whitelist + * Bug 10537: Build an Arabic version of TBB 3.5 * Update Torbutton to 1.6.5.5 * Bug 9486: Clear NoScript Temporary Permissions on New Identity - * Bug 10403: Include Arabic translations + * Include Arabic translations * Update Tor Launcher to 0.2.4.3 - * Bug 10403: Include Arabic translations + * Include Arabic translations * Update Tor to 0.2.4.20 * Update OpenSSL to 1.0.1f * Update NoScript to 2.6.8.12 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bug 10323: Omit libgcc and libstdc++ in TorBrowser
commit 2a6f554fefd4768e8adb769c72d43770a1278ab2 Author: Georg Koppen g...@torproject.org Date: Tue Feb 11 09:51:30 2014 +0100 Bug 10323: Omit libgcc and libstdc++ in TorBrowser Since https://bugzilla.mozilla.org/show_bug.cgi?id=831707 and https://bugzilla.mozilla.org/show_bug.cgi?id=876416 landed Firefox code is linked statically against libgcc and libstdc++ when building with mingw-w64. We can therefore stop shipping both in Tor Browser Bundles based on Firefox 24 ESR. Relanding the backed out patch. --- gitian/descriptors/windows/gitian-firefox.yml |2 -- 1 file changed, 2 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index f985b56..1c151ea 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -164,8 +164,6 @@ script: | # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ - cp -a /usr/i686-w64-mingw32/lib/libgcc_s_sjlj-1.dll $INSTDIR/Browser/ - cp -a /usr/i686-w64-mingw32/lib/libstdc*dll $INSTDIR/Browser/ cp -a ~/build/msvcr100.dll $INSTDIR/Browser/ # # What the hell are these three bytes anyways? ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.4] fold in changes entries
commit cf2a78248f7cad2c129628653080329f4c7ad129 Author: Roger Dingledine a...@torproject.org Date: Tue Feb 11 06:23:41 2014 -0500 fold in changes entries --- ChangeLog| 26 ++ changes/bug10470 |4 changes/bug10485 |4 changes/bug10793 |4 changes/bug10835 |4 changes/bug9602 |5 - changes/bug9716 |4 7 files changed, 26 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 595e259..876152d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +Changes in version 0.2.4.21 - 2014-02-1? + + o Minor features: +- Always clear OpenSSL bignums before freeing them -- even bignums + that don't contain secrets. Resolves ticket 10793. Patch by + Florent Daigniere. + + o Minor bugfixes: +- Set the listen() backlog limit to the largest actually supported + on the system, not to the value in a header file. Fixes bug 9716; + bugfix on every released Tor. +- Avoid a segfault on SIGUSR1, where we had freed a connection but did + not entirely remove it from the connection lists. Fixes bug 9602; + bugfix on 0.2.4.4-alpha. +- Fix a segmentation fault in our benchmark code when running with + Fedora's OpenSSL package, or any other OpenSSL that provides + ECDH but not P224. Fixes bug 10835; bugfix on 0.2.4.8-alpha. +- Move log message about circuit handshake counts into the heartbeat + message where it belongs, instead of logging it once per hour + unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc. + + o Documentation fixes: +- Document that all but one DirPort entry must have the NoAdvertise + flag set. Fixes bug 10470; bugfix on 0.2.3.3-alpha / 0.2.3.16-alpha. + + Changes in version 0.2.4.20 - 2013-12-22 Tor 0.2.4.20 fixes potentially poor random number generation for users who 1) use OpenSSL 1.0.0 or later, 2) set HardwareAccel 1 in their diff --git a/changes/bug10470 b/changes/bug10470 deleted file mode 100644 index 2b75343..000 --- a/changes/bug10470 +++ /dev/null @@ -1,4 +0,0 @@ - o Documentation fixes: -- Note that all but one DirPort entry must have the NoAdvertise flag - set. Fix for #10470. - diff --git a/changes/bug10485 b/changes/bug10485 deleted file mode 100644 index 7e5fa53..000 --- a/changes/bug10485 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: -- Move message about circuit handshake counts into the heartbeat - message where it belongs, instead of logging it once per hour - unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc. diff --git a/changes/bug10793 b/changes/bug10793 deleted file mode 100644 index 24c4025..000 --- a/changes/bug10793 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (security): -- Always clear OpenSSL bignums before freeing them--even bignums - that don't contain secrets. Resolves ticket 10793. Patch by - Florent Daigniere. diff --git a/changes/bug10835 b/changes/bug10835 deleted file mode 100644 index 9df7bdd..000 --- a/changes/bug10835 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (testing): -- Fix a segmentation fault in our benchmark code when running with - Fedora's OpenSSL package, or any other OpenSSL that provides - ECDH but not P224. Fixes bug 10835; bugfix on 0.2.4.8-alpha. diff --git a/changes/bug9602 b/changes/bug9602 deleted file mode 100644 index 2dc13c4..000 --- a/changes/bug9602 +++ /dev/null @@ -1,5 +0,0 @@ - o Bugfixes - - Null out orconn-chan-conn when closing orconn in case orconn is freed - before channel_run_cleanup() gets to orconn-chan, and handle the null - conn edge case correctly in channel_tls_t methods. Fixes bug #9602; - bugfix on 0.2.4.4-alpha. diff --git a/changes/bug9716 b/changes/bug9716 deleted file mode 100644 index 5e39077..000 --- a/changes/bug9716 +++ /dev/null @@ -1,4 +0,0 @@ - o Bugfixes (performance): -- Set the listen() backlog limit to the largest actually supported - on the system, not to the value in a header file. Fixes bug 9716; - bugfix on every released Tor. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [obfs-flash/master] note that this is a temp workaround
commit 7e2a1fbbee1b0941aaea197d1fedfd35f8560cc9 Author: Ximin Luo infini...@torproject.org Date: Tue Feb 11 14:29:06 2014 + note that this is a temp workaround --- obfs-flash-client |1 + 1 file changed, 1 insertion(+) diff --git a/obfs-flash-client b/obfs-flash-client index 4f44bbc..32c0c9c 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -7,6 +7,7 @@ import sys from collections import namedtuple from functools import partial +# TODO(infinity0): this is temporary workaround until we do #10047 if sys.platform == 'win32': os.environ[KILL_CHILDREN_ON_DEATH] = 1 from pyptlib.util import parse_addr_spec ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [obfs-flash/master] Merge branch 'fix-w32-kill'
commit c2ecc7e035a81bcd9cc23784d4be5dfac963beac Merge: a5bb87f 951616c Author: Ximin Luo infini...@torproject.org Date: Tue Feb 11 14:28:38 2014 + Merge branch 'fix-w32-kill' obfs-flash-client |2 ++ setup.py | 14 -- 2 files changed, 14 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [obfs-flash/master] use the autokill workaround mentioned in 10006
commit 14f5823a0965b29aa8b41682295b1a75ab78c152 Author: Ximin Luo infini...@gmx.com Date: Tue Oct 29 21:09:57 2013 + use the autokill workaround mentioned in 10006 --- obfs-flash-client |2 ++ 1 file changed, 2 insertions(+) diff --git a/obfs-flash-client b/obfs-flash-client index 93d2223..4f44bbc 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -7,6 +7,8 @@ import sys from collections import namedtuple from functools import partial +if sys.platform == 'win32': +os.environ[KILL_CHILDREN_ON_DEATH] = 1 from pyptlib.util import parse_addr_spec from pyptlib.util.subproc import auto_killall, Popen from pyptlib.client import ClientTransportPlugin ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [obfs-flash/master] add txsocksx to direct deps, and zope.interface to indirect deps, in py2exe setup script
commit 951616c9789689d572d52ee2764b0a3ca2bd0bb3
Author: Ximin Luo infini...@gmx.com
Date: Fri Nov 1 18:04:25 2013 +
add txsocksx to direct deps, and zope.interface to indirect deps, in py2exe
setup script
- works around py2exe on wine silently not finding them
---
setup.py | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index 2046d96..66f2262 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,23 @@
from distutils.core import setup
import py2exe
+# if py2exe complains can't find P, try one of the following workarounds:
+#
+# a. py2exe doesn't support zipped eggs -
http://www.py2exe.org/index.cgi/ExeWithEggs
+# You should give the --always-unzip option to easy_install, or you can use
setup.py directly
+# $ python setup.py install --record install.log
--single-version-externally-managed
+# Don't forget to remove the previous zipped egg.
+#
+# b. Add an empty __init__.py to the P/ top-level directory, if it's missing
+# - this is due to a bug (or misleading documentation) in python's
imp.find_module()
+
setup(
console=[obfs-flash-client],
zipfile=py2exe-obfs-flash-client.zip,
options={
py2exe: {
-includes: [pyptlib, twisted],
-packages: [ometa, terml],
+includes: [pyptlib, twisted, txsocksx],
+packages: [ometa, terml, zope.interface],
},
},
)
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug10722'
commit cb28fe486ff7f9ebc81a7ccc90f5459429572587 Merge: dd3f2f6 bb21d14 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 10:08:58 2014 -0500 Merge remote-tracking branch 'public/bug10722' changes/bug10722|8 src/or/rendclient.c | 27 +++ 2 files changed, 31 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add changes file for ticket 10842.
commit aae4ebf63f4da02ff35b063bbaa744379fbfc1e1 Author: Karsten Loesing karsten.loes...@gmx.net Date: Tue Feb 11 08:44:35 2014 +0100 Add changes file for ticket 10842. This is a bugfix on 0.2.2.26-beta, because 6b83b3b made directory authorities remove themselves from the list of directory authorities to upload to, but didn't suppress the warning in case they're the only directory authority in the network. --- changes/bug10842 |4 1 file changed, 4 insertions(+) diff --git a/changes/bug10842 b/changes/bug10842 new file mode 100644 index 000..0ead9e7 --- /dev/null +++ b/changes/bug10842 @@ -0,0 +1,4 @@ + o Minor bugfixes: +- Suppress a warning that votes and signatures cannot be uploaded to + other directory authorities if there's only one directory authority + in the network. Bugfix on 0.2.2.26-beta. Resolves ticket 10842. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Apply StrictNodes to hidden service directories early
commit bb21d14255c2f5c94173dda2ba30c83478044779
Author: Nick Mathewson ni...@torproject.org
Date: Fri Jan 24 12:56:10 2014 -0500
Apply StrictNodes to hidden service directories early
Previously, we would sometimes decide in directory_get_from_hs_dir()
to connect to an excluded node, and then later in
directory_initiate_command_routerstatus_rend() notice that it was
excluded and strictnodes was set, and catch it as a stopgap.
Additionally, this patch preferentially tries to fetch from
non-excluded nodes even when StrictNodes is off.
Fix for bug #10722. Bugfix on 0.2.0.10-alpha (the v2 hidserv directory
system was introduced in e136f00ca). Reported by mr-4.
---
changes/bug10722|8
src/or/rendclient.c | 27 +++
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/changes/bug10722 b/changes/bug10722
new file mode 100644
index 000..dd4711f
--- /dev/null
+++ b/changes/bug10722
@@ -0,0 +1,8 @@
+ o Minor bugfixes:
+- Consider non-excluded hidden service directory servers before
+ excluded ones. Do not consider excluded hidden service directory
+ servers at all if StrictNodes was set. (Previously, we would
+ sometimes decide to connect to those servers, and then realize
+ before we initiated a connection that we had excluded them.)
+ Fix for bug #10722. Bugfix on 0.2.0.10-alpha. Reported by
+ mr-4.
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index bb4bd9b..634a98c 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -617,11 +617,14 @@ static int
directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query)
{
smartlist_t *responsible_dirs = smartlist_new();
+ smartlist_t *usable_responsible_dirs = smartlist_new();
+ const or_options_t *options = get_options();
routerstatus_t *hs_dir;
char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
time_t now = time(NULL);
char descriptor_cookie_base64[3*REND_DESC_COOKIE_LEN_BASE64];
- int tor2web_mode = get_options()-Tor2webMode;
+ const int tor2web_mode = options-Tor2webMode;
+ int excluded_some;
tor_assert(desc_id);
tor_assert(rend_query);
/* Determine responsible dirs. Even if we can't get all we want,
@@ -642,16 +645,32 @@ directory_get_from_hs_dir(const char *desc_id, const
rend_data_t *rend_query)
dir, desc_id_base32, rend_query, 0, 0);
const node_t *node = node_get_by_id(dir-identity_digest);
if (last + REND_HID_SERV_DIR_REQUERY_PERIOD = now ||
- !node || !node_has_descriptor(node))
- SMARTLIST_DEL_CURRENT(responsible_dirs, dir);
+ !node || !node_has_descriptor(node)) {
+SMARTLIST_DEL_CURRENT(responsible_dirs, dir);
+continue;
+ }
+ if (! routerset_contains_node(options-ExcludeNodes, node)) {
+smartlist_add(usable_responsible_dirs, dir);
+ }
});
- hs_dir = smartlist_choose(responsible_dirs);
+ excluded_some =
+smartlist_len(usable_responsible_dirs) smartlist_len(responsible_dirs);
+
+ hs_dir = smartlist_choose(usable_responsible_dirs);
+ if (! hs_dir ! options-StrictNodes)
+hs_dir = smartlist_choose(responsible_dirs);
+
smartlist_free(responsible_dirs);
+ smartlist_free(usable_responsible_dirs);
if (!hs_dir) {
log_info(LD_REND, Could not pick one of the responsible hidden
service directories, because we requested them all
recently without success.);
+if (options-StrictNodes excluded_some) {
+ log_info(LD_REND, There are others that we could have tried, but
+ they are all excluded, and StrictNodes is set.);
+}
return 0;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Suppress warning in networks with only 1 dirauth.
commit ebe7e22045327d2352c1a7582759d46e966d69e0
Author: Karsten Loesing karsten.loes...@gmx.net
Date: Sat Feb 8 11:02:27 2014 +0100
Suppress warning in networks with only 1 dirauth.
---
src/or/directory.c |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/or/directory.c b/src/or/directory.c
index ec1e776..fd4e796 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -287,8 +287,12 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t
router_purpose,
if ((type ds-type) == 0)
continue;
- if (exclude_self router_digest_is_me(ds-digest))
+ if (exclude_self router_digest_is_me(ds-digest)) {
+/* we don't upload to ourselves, but at least there's now at least
+ * one authority of this type that has what we wanted to upload. */
+found = 1;
continue;
+ }
if (options-StrictNodes
routerset_contains_routerstatus(options-ExcludeNodes, rs, -1)) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Note 10365-change in spec.
commit 4e3894c7808a771f8b8b2afd0049ec693f4c36ef Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 10:35:49 2014 -0500 Note 10365-change in spec. --- tor-spec.txt |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tor-spec.txt b/tor-spec.txt index 0ec3b3d..1c10d1d 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -494,7 +494,9 @@ see tor-design.pdf. integers. Both parties MUST select as the link protocol version the highest number contained both in the VERSIONS cell they sent and in the versions cell they received. If they have no such version in common, - they cannot communicate and MUST close the connection. + they cannot communicate and MUST close the connection. Either party MUST + close the connection of the versions cell is not well-formed (for example, + if it contains an odd number of bytes). Since the version 1 link protocol does not use the renegotiation handshake, implementations MUST NOT list version 1 in their VERSIONS ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Tweak DirAuthority documentation
commit 0228b9bd4baa9df3ee877b5f02bf13491b233dab Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 11:34:32 2014 -0500 Tweak DirAuthority documentation Per a comment from karsten, there is no longer v2 authority support, so stop pretending there is. Also, fix a grammar error.x --- doc/tor.1.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e66fad2..b571b26 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -331,8 +331,8 @@ GENERAL OPTIONS and port, with the specified key fingerprint. This option can be repeated many times, for multiple authoritative directory servers. Flags are separated by spaces, and determine what kind of an authority this directory -is. By default, every authority is authoritative for current (v2)-style -directories, unless the no-v2 flag is given. If the v1 flags is +is. By default, an authority is not authoritative any directory style +or version, unless an appropriate flag is given. If the v1 flag is provided, Tor will use this server as an authority for old-style (v1) directories as well. (Only directory mirrors care about this.) Tor will use this authority as a bridge authoritative directory if the ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Remove options for configuring HS authorities.
commit c0483c7f851b2aa1933fb591eb0ca8f66b162022
Author: Nick Mathewson ni...@torproject.org
Date: Mon Feb 10 22:41:52 2014 -0500
Remove options for configuring HS authorities.
(There is no longer meaningfully any such thing as a HS authority,
since we stopped uploading or downloading v0 hs descriptors in
0.2.2.1-alpha.)
Implements #10881, and part of #10841.
---
changes/bug10881 |7 +++
doc/tor.1.txt | 18 --
src/or/config.c| 40 +++-
src/or/directory.c | 44
src/or/or.h|5 -
src/or/router.c|3 +--
6 files changed, 23 insertions(+), 94 deletions(-)
diff --git a/changes/bug10881 b/changes/bug10881
new file mode 100644
index 000..3fcc90e
--- /dev/null
+++ b/changes/bug10881
@@ -0,0 +1,7 @@
+ o Removed code:
+
+- Remove code for designating authorities as Hidden service
+ authorities. There has been no use of hidden service authorities
+ since 0.2.2.1-alpha, when we stopped uploading or downloading v0
+ hidden service descriptors. Fixes bug 10881; part of a fix for bug
+ 10841.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ee1e086..e66fad2 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -334,9 +334,7 @@ GENERAL OPTIONS
is. By default, every authority is authoritative for current (v2)-style
directories, unless the no-v2 flag is given. If the v1 flags is
provided, Tor will use this server as an authority for old-style (v1)
-directories as well. (Only directory mirrors care about this.) Tor will
-use this server as an authority for hidden service information if the hs
-flag is set, or if the v1 flag is set and the no-hs flag is **not**
set.
+directories as well. (Only directory mirrors care about this.)
Tor will use this authority as a bridge authoritative directory if the
bridge flag is set. If a flag orport=**port** is given, Tor will use
the
given port when opening encrypted tunnels to the dirserver. If a flag
@@ -365,17 +363,14 @@ GENERAL OPTIONS
[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**]
__address__:__port__ __fingerprint__ +
-[[AlternateHSAuthority]] **AlternateHSAuthority** [__nickname__] [**flags**]
__address__:__port__ __fingerprint__ +
-
[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__]
[**flags**] __address__:__port__ __ fingerprint__::
These options behave as DirAuthority, but they replace fewer of the
default directory authorities. Using
AlternateDirAuthority replaces the default Tor directory authorities, but
-leaves the default hidden service authorities and bridge authorities in
-place. Similarly, AlternateHSAuthority replaces the default hidden
-service authorities, but not the directory or bridge authorities; and
+leaves the default bridge authorities in
+place. Similarly,
AlternateBridgeAuthority replaces the default bridge authority,
-but leaves the directory and hidden service authorities alone.
+but leaves the directory authorities alone.
[[DisableAllSwap]] **DisableAllSwap** **0**|**1**::
If set to 1, Tor will attempt to lock all current and future memory pages,
@@ -1794,11 +1789,6 @@ if DirPort is non-zero):
accept or publish descriptors that contradict a registered binding. See
**approved-routers** in the **FILES** section below.
-[[HSAuthoritativeDir]] **HSAuthoritativeDir** **0**|**1**::
-When this option is set in addition to **AuthoritativeDirectory**, Tor also
-accepts and serves v0 hidden service descriptors,
-which are produced and used by Tor 0.2.1.x and older. (Default: 0)
-
[[HidServDirectoryV2]] **HidServDirectoryV2** **0**|**1**::
When this option is set, Tor accepts and serves v2 hidden service
descriptors. Setting DirPort is not required for this, because clients
diff --git a/src/or/config.c b/src/or/config.c
index e7847d5..d298177 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -137,7 +137,7 @@ static config_var_t option_vars_[] = {
V(AllowSingleHopExits, BOOL, 0),
V(AlternateBridgeAuthority,LINELIST, NULL),
V(AlternateDirAuthority, LINELIST, NULL),
- V(AlternateHSAuthority,LINELIST, NULL),
+ OBSOLETE(AlternateHSAuthority),
V(AssumeReachable, BOOL, 0),
V(AuthDirBadDir, LINELIST, NULL),
V(AuthDirBadDirCCs,CSV, ),
@@ -276,7 +276,7 @@ static config_var_t option_vars_[] = {
VAR(HiddenServiceVersion,LINELIST_S, RendConfigLines,NULL),
VAR(HiddenServiceAuthorizeClient,LINELIST_S,RendConfigLines, NULL),
V(HidServAuth, LINELIST, NULL),
- V(HSAuthoritativeDir, BOOL, 0),
+ OBSOLETE(HSAuthoritativeDir),
OBSOLETE(HSAuthorityRecordStats),
V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, 0),
[tor-commits] [tor/master] Merge branch 'bug10881'
commit 5e0cdc5ef254993d9244795eed217ac3eb1f7c24 Merge: cb065a5 0228b9b Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 11:42:06 2014 -0500 Merge branch 'bug10881' changes/bug10881 |7 +++ doc/tor.1.txt | 22 ++ src/or/config.c| 40 +++- src/or/directory.c | 44 src/or/or.h|5 - src/or/router.c|3 +-- 6 files changed, 25 insertions(+), 96 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Excise the insertion_time_elem_t logic
commit 3133cde3c12a814fab4c83ba59d5dfeace397ebc
Author: Nick Mathewson ni...@torproject.org
Date: Mon Feb 10 13:55:27 2014 -0500
Excise the insertion_time_elem_t logic
It's now redundant with the inserted_time field in packed_cell_t
Fixes bug 10870.
---
changes/bug10870 |6
src/or/or.h | 19 -
src/or/relay.c | 83 +-
3 files changed, 13 insertions(+), 95 deletions(-)
diff --git a/changes/bug10870 b/changes/bug10870
new file mode 100644
index 000..d8a00f4
--- /dev/null
+++ b/changes/bug10870
@@ -0,0 +1,6 @@
+ o Code simplification and refactoring:
+- Remove data structures which were introduced to implement the
+ CellStatistics option: they are now redundant with the addition
+ of timestamp to the regular packed_cell_t data structure, which
+ we did in 0.2.4.18-rc in order to resolve #9093. Fixes bug
+ 10870.
\ No newline at end of file
diff --git a/src/or/or.h b/src/or/or.h
index 5318b0f..3eaf344 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1081,31 +1081,12 @@ typedef struct packed_cell_t {
* bits truncated) when this cell was inserted. */
} packed_cell_t;
-/* This next structure may be obsoleted by inserted_time in
- * packed_cell_t */
-
-/** Number of cells added to a circuit queue including their insertion
- * time on 10 millisecond detail; used for buffer statistics. */
-typedef struct insertion_time_elem_t {
- struct insertion_time_elem_t *next; /** Next element in queue. */
- uint32_t insertion_time; /** When were cells inserted (in 10 ms steps
- * starting at 0:00 of the current day)? */
- unsigned counter; /** How many cells were inserted? */
-} insertion_time_elem_t;
-
-/** Queue of insertion times. */
-typedef struct insertion_time_queue_t {
- struct insertion_time_elem_t *first; /** First element in queue. */
- struct insertion_time_elem_t *last; /** Last element in queue. */
-} insertion_time_queue_t;
-
/** A queue of cells on a circuit, waiting to be added to the
* or_connection_t's outbuf. */
typedef struct cell_queue_t {
packed_cell_t *head; /** The first cell, or NULL if the queue is empty. */
packed_cell_t *tail; /** The last cell, or NULL if the queue is empty. */
int n; /** The number of cells in the queue. */
- insertion_time_queue_t *insertion_times; /** Insertion times of cells. */
} cell_queue_t;
/** Beginning of a RELAY cell payload. */
diff --git a/src/or/relay.c b/src/or/relay.c
index 63119cb..6e5b12e 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2040,10 +2040,6 @@ static size_t total_cells_allocated = 0;
/** A memory pool to allocate packed_cell_t objects. */
static mp_pool_t *cell_pool = NULL;
-/** Memory pool to allocate insertion_time_elem_t objects used for cell
- * statistics. */
-static mp_pool_t *it_pool = NULL;
-
/** Allocate structures to hold cells. */
void
init_cell_pool(void)
@@ -2062,10 +2058,6 @@ free_cell_pool(void)
mp_pool_destroy(cell_pool);
cell_pool = NULL;
}
- if (it_pool) {
-mp_pool_destroy(it_pool);
-it_pool = NULL;
- }
}
/** Free excess storage in cell pool. */
@@ -2154,36 +2146,6 @@ cell_queue_append_packed_copy(cell_queue_t *queue, const
cell_t *cell,
tor_gettimeofday_cached(now);
copy-inserted_time = (uint32_t)tv_to_msec(now);
- /* Remember the time when this cell was put in the queue. */
- /* This may be obsoleted by inserted_time */
- if (get_options()-CellStatistics) {
-uint32_t added;
-insertion_time_queue_t *it_queue = queue-insertion_times;
-if (!it_pool)
- it_pool = mp_pool_new(sizeof(insertion_time_elem_t), 1024);
-
-#define SECONDS_IN_A_DAY 86400L
-added = (uint32_t)(((now.tv_sec % SECONDS_IN_A_DAY) * 100L)
-+ ((uint32_t)now.tv_usec / (uint32_t)1L));
-if (!it_queue) {
- it_queue = tor_malloc_zero(sizeof(insertion_time_queue_t));
- queue-insertion_times = it_queue;
-}
-if (it_queue-last it_queue-last-insertion_time == added) {
- it_queue-last-counter++;
-} else {
- insertion_time_elem_t *elem = mp_pool_get(it_pool);
- elem-next = NULL;
- elem-insertion_time = added;
- elem-counter = 1;
- if (it_queue-last) {
-it_queue-last-next = elem;
-it_queue-last = elem;
- } else {
-it_queue-first = it_queue-last = elem;
- }
-}
- }
cell_queue_append(queue, copy);
}
@@ -2200,14 +2162,6 @@ cell_queue_clear(cell_queue_t *queue)
}
queue-head = queue-tail = NULL;
queue-n = 0;
- if (queue-insertion_times) {
-while (queue-insertion_times-first) {
- insertion_time_elem_t *elem = queue-insertion_times-first;
- queue-insertion_times-first = elem-next;
- mp_pool_release(elem);
-}
-tor_free(queue-insertion_times);
- }
}
/** Extract and return the cell at the head of bqueue/b; return NULL if
@@ -2232,9 +2186,7 @@
[tor-commits] [tor/master] Merge remote-tracking branch 'public/no_itime_queue'
commit 5b55e0e18180d96331e846b700ac194e24f43b8e
Merge: a73b0da 3133cde
Author: Nick Mathewson ni...@torproject.org
Date: Mon Feb 10 15:04:23 2014 -0500
Merge remote-tracking branch 'public/no_itime_queue'
The conflicts here were tricky, and required me to eliminate the
command-queue as well. That wasn't so hard.
Conflicts:
src/or/or.h
src/or/relay.c
changes/bug10870 |6 ++
src/or/or.h | 36 --
src/or/relay.c | 205 ++
3 files changed, 43 insertions(+), 204 deletions(-)
diff --cc src/or/or.h
index b63b1ff,3eaf344..15cda28
--- a/src/or/or.h
+++ b/src/or/or.h
@@@ -1124,45 -1084,9 +1124,9 @@@ typedef struct packed_cell_t
/** A queue of cells on a circuit, waiting to be added to the
* or_connection_t's outbuf. */
typedef struct cell_queue_t {
- packed_cell_t *head; /** The first cell, or NULL if the queue is empty. */
- packed_cell_t *tail; /** The last cell, or NULL if the queue is empty. */
+ /** Linked list of packed_cell_t*/
+ TOR_SIMPLEQ_HEAD(cell_simpleq, packed_cell_t) head;
int n; /** The number of cells in the queue. */
- insertion_time_queue_t *insertion_times; /** Insertion times of cells. */
- /** Commands of inserted cells. */
- insertion_command_queue_t *insertion_commands;
} cell_queue_t;
/** Beginning of a RELAY cell payload. */
diff --cc src/or/relay.c
index b5e4ff7,6e5b12e..94016b4
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@@ -2153,68 -2136,13 +2137,20 @@@ cell_queue_append(cell_queue_t *queue,
++queue-n;
}
- /** Append command of type bcommand/b in direction to bqueue/b for
- * CELL_STATS event. */
- static void
- cell_command_queue_append(cell_queue_t *queue, uint8_t command)
- {
- insertion_command_queue_t *ic_queue = queue-insertion_commands;
- if (!ic_pool)
- ic_pool = mp_pool_new(sizeof(insertion_command_elem_t), 1024);
- if (!ic_queue) {
- ic_queue = tor_malloc_zero(sizeof(insertion_command_queue_t));
- queue-insertion_commands = ic_queue;
- }
- if (ic_queue-last ic_queue-last-command == command) {
- ic_queue-last-counter++;
- } else {
- insertion_command_elem_t *elem = mp_pool_get(ic_pool);
- elem-next = NULL;
- elem-command = command;
- elem-counter = 1;
- if (ic_queue-last) {
- ic_queue-last-next = elem;
- ic_queue-last = elem;
- } else {
- ic_queue-first = ic_queue-last = elem;
- }
- }
- }
-
- /** Retrieve oldest command from bqueue/b and write it to
- * bcommand/b for CELL_STATS event. Return 0 for success, -1
- * otherwise. */
- static int
- cell_command_queue_pop(uint8_t *command, cell_queue_t *queue)
- {
- int res = -1;
- insertion_command_queue_t *ic_queue = queue-insertion_commands;
- if (ic_queue ic_queue-first) {
- insertion_command_elem_t *ic_elem = ic_queue-first;
- ic_elem-counter--;
- if (ic_elem-counter 1) {
- ic_queue-first = ic_elem-next;
- if (ic_elem == ic_queue-last)
- ic_queue-last = NULL;
- mp_pool_release(ic_elem);
- }
- *command = ic_elem-command;
- res = 0;
- }
- return res;
- }
-
-/** Append a newly allocated copy of bcell/b to the end of bqueue/b */
+/** Append a newly allocated copy of bcell/b to the end of the
+ * bexitward/b (or app-ward) bqueue/b of bcirc/b. If
+ * buse_stats/b is true, record statistics about the cell.
+ */
void
-cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell,
- int wide_circ_ids)
+cell_queue_append_packed_copy(circuit_t *circ, cell_queue_t *queue,
+ int exitward, const cell_t *cell,
+ int wide_circ_ids, int use_stats)
{
struct timeval now;
packed_cell_t *copy = packed_cell_copy(cell, wide_circ_ids);
++ (void)circ;
++ (void)exitward;
++ (void)use_stats;
tor_gettimeofday_cached(now);
copy-inserted_time = (uint32_t)tv_to_msec(now);
@@@ -2276,21 -2153,15 +2169,13 @@@ cell_queue_init(cell_queue_t *queue
void
cell_queue_clear(cell_queue_t *queue)
{
- packed_cell_t *cell, *next;
- cell = queue-head;
- while (cell) {
-next = cell-next;
+ packed_cell_t *cell;
+ while ((cell = TOR_SIMPLEQ_FIRST(queue-head))) {
+TOR_SIMPLEQ_REMOVE_HEAD(queue-head, next);
packed_cell_free_unchecked(cell);
-cell = next;
}
- queue-head = queue-tail = NULL;
+ TOR_SIMPLEQ_INIT(queue-head);
queue-n = 0;
- if (queue-insertion_times) {
- while (queue-insertion_times-first) {
- insertion_time_elem_t *elem = queue-insertion_times-first;
- queue-insertion_times-first = elem-next;
- mp_pool_release(elem);
- }
- tor_free(queue-insertion_times);
- }
}
/** Extract and return the cell at the head of bqueue/b; return NULL if
@@@ -2443,6 -2316,6 +2326,17 @@@ set_streams_blocked_on_circ(circuit_t *
return n;
}
++/** Extract the
[tor-commits] [translation/tails-iuk] Update translations for tails-iuk
commit 65753aa94345342ba26be775b5206dbfe40decbf
Author: Translation commit bot translat...@torproject.org
Date: Tue Feb 11 18:15:46 2014 +
Update translations for tails-iuk
---
gl.po | 41 +
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/gl.po b/gl.po
index 1b85815..2958c9d 100644
--- a/gl.po
+++ b/gl.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# bulebule luz.ar...@udc.es, 2014
msgid
msgstr
Project-Id-Version: The Tor Project\n
Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
-POT-Creation-Date: 2014-01-07 20:17+0100\n
-PO-Revision-Date: 2014-01-08 08:17+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2014-01-29 14:37+0100\n
+PO-Revision-Date: 2014-02-11 18:10+\n
+Last-Translator: bulebule luz.ar...@udc.es\n
Language-Team: Galician
(http://www.transifex.com/projects/p/torproject/language/gl/)\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
@@ -32,7 +33,7 @@ msgstr
#: ../lib/Tails/IUK/Frontend.pm:205
msgid Error while checking for upgrades
-msgstr
+msgstr Produciuse un erro ao buscar actualizacións
#: ../lib/Tails/IUK/Frontend.pm:208
msgid
@@ -73,7 +74,7 @@ msgstr
#: ../lib/Tails/IUK/Frontend.pm:305
msgid Error while detecting available upgrades
-msgstr
+msgstr Produciuse un erro ao detectar actualizacións
#: ../lib/Tails/IUK/Frontend.pm:315
#, perl-brace-format
@@ -93,15 +94,15 @@ msgstr
#: ../lib/Tails/IUK/Frontend.pm:330
msgid Upgrade available
-msgstr
+msgstr Actualización dispoñÃbel
#: ../lib/Tails/IUK/Frontend.pm:331
msgid Upgrade now
-msgstr
+msgstr Actualizar agora
#: ../lib/Tails/IUK/Frontend.pm:332
msgid Upgrade later
-msgstr
+msgstr Actualizar máis tarde
#: ../lib/Tails/IUK/Frontend.pm:342
#, perl-brace-format
@@ -117,16 +118,16 @@ msgstr
#: ../lib/Tails/IUK/Frontend.pm:356
msgid New version available
-msgstr
+msgstr Está dispoñÃbel unha nova versión
#: ../lib/Tails/IUK/Frontend.pm:412
msgid Downloading upgrade
-msgstr
+msgstr Descargando actualización
#: ../lib/Tails/IUK/Frontend.pm:415
#, perl-brace-format
msgid Downloading the upgrade to %{name}s %{version}s...
-msgstr
+msgstr A descargar a actualización en %{name}s %{version}s...
#: ../lib/Tails/IUK/Frontend.pm:456
msgid
@@ -148,7 +149,7 @@ msgstr
#: ../lib/Tails/IUK/Frontend.pm:480 ../lib/Tails/IUK/Frontend.pm:494
msgid Error while downloading the upgrade
-msgstr
+msgstr Produciuse un erro ao descargar a actualización
#: ../lib/Tails/IUK/Frontend.pm:487
#, perl-brace-format
@@ -159,11 +160,11 @@ msgstr
#: ../lib/Tails/IUK/Frontend.pm:506
msgid Error while creating temporary downloading directory
-msgstr
+msgstr Produciuse un erro ao crear o directorio de descargas temporal
#: ../lib/Tails/IUK/Frontend.pm:509
msgid Failed to create temporary download directory
-msgstr
+msgstr Non se puido crear un directorio de descargas temporal
#: ../lib/Tails/IUK/Frontend.pm:521
msgid
@@ -181,19 +182,19 @@ msgstr
#: ../lib/Tails/IUK/Frontend.pm:527
msgid Restart now
-msgstr
+msgstr Reiniciar agora
#: ../lib/Tails/IUK/Frontend.pm:528
msgid Restart later
-msgstr
+msgstr Reiniciar máis tarde
#: ../lib/Tails/IUK/Frontend.pm:539
msgid Error while restarting the system
-msgstr
+msgstr Produciuse un erro ao reiniciar o sistema
#: ../lib/Tails/IUK/Frontend.pm:542
msgid Failed to restart the system
-msgstr
+msgstr Non se puido reiniciar o sistema
#: ../lib/Tails/IUK/Frontend.pm:557
msgid Error while shutting down the network
@@ -205,7 +206,7 @@ msgstr
#: ../lib/Tails/IUK/Frontend.pm:570
msgid Upgrading the system
-msgstr
+msgstr A actualizar o sistema
#: ../lib/Tails/IUK/Frontend.pm:572
msgid
@@ -224,4 +225,4 @@ msgstr
#: ../lib/Tails/IUK/Frontend.pm:629
msgid Error while installing the upgrade
-msgstr
+msgstr Produciuse un erro ao instalar a actualización
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] ticket 9934 says DROPGUARDS is going into 0.2.5.2-alpha
commit 10cfb4c63aadcc7fdcdc10f55a1e324b1148f37c Author: Roger Dingledine a...@torproject.org Date: Tue Feb 11 17:18:59 2014 -0500 ticket 9934 says DROPGUARDS is going into 0.2.5.2-alpha --- control-spec.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 9d1df49..0725d26 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1157,7 +1157,7 @@ Tor replies with 250 OK on success. - [DROPGUARDS was added in Tor 0.2.5.1-alpha.] + [DROPGUARDS was added in Tor 0.2.5.2-alpha.] 4. Replies ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Free leakable values in the unit tests.
commit c3720c05fa44b3790ab0dc37e2506ee482796e21
Author: Nick Mathewson ni...@torproject.org
Date: Tue Feb 11 18:10:33 2014 -0500
Free leakable values in the unit tests.
Thanks, Coverity! (CID 1171414, 1171415, 1171416)
---
src/test/test.c|6 --
src/test/test_config.c | 11 +--
src/test/test_dir.c|4 +++-
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/test/test.c b/src/test/test.c
index 522f2af..45f7c09 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -875,6 +875,7 @@ test_policies(void)
{
int i;
char *policy = NULL;
+short_policy_t *parsed;
smartlist_t *chunks = smartlist_new();
smartlist_add(chunks, tor_strdup(accept ));
for (i=1; i1; ++i)
@@ -883,8 +884,9 @@ test_policies(void)
policy = smartlist_join_strings(chunks, , 0, NULL);
SMARTLIST_FOREACH(chunks, char *, ch, tor_free(ch));
smartlist_free(chunks);
-tt_ptr_op(NULL, ==, parse_short_policy(policy));/* shouldn't be accepted */
-tor_free(policy); /* could leak. */
+parsed = parse_short_policy(policy);/* shouldn't be accepted */
+tor_free(policy);
+tt_ptr_op(NULL, ==, parsed);
}
/* truncation ports */
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 3a1b6d7..a1dff64 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -247,6 +247,7 @@ test_config_write_to_data_subdir(void *arg)
{
or_options_t* options = get_options_mutable();
char *datadir = options-DataDirectory = tor_strdup(get_fname(datadir-1));
+ char *cp = NULL;
const char* subdir = test_stats;
const char* fname = test_file;
const char* str =
@@ -280,17 +281,23 @@ test_config_write_to_data_subdir(void *arg)
// Content of file after write attempt should be
// equal to the original string.
test_assert(!write_to_data_subdir(subdir, fname, str, NULL));
- test_streq(read_file_to_str(filepath, 0, NULL), str);
+ cp = read_file_to_str(filepath, 0, NULL);
+ test_streq(cp, str);
+ tor_free(cp);
// A second write operation should overwrite the old content.
test_assert(!write_to_data_subdir(subdir, fname, str, NULL));
- test_streq(read_file_to_str(filepath, 0, NULL), str);
+ cp = read_file_to_str(filepath, 0, NULL);
+ test_streq(cp, str);
+ tor_free(cp);
+
done:
(void) unlink(filepath);
rmdir(options-DataDirectory);
tor_free(datadir);
tor_free(filepath);
+ tor_free(cp);
}
/* Test helper function: Make sure that a bridge line gets parsed
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 7c625ce..dcfe98d 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -1230,7 +1230,8 @@ test_a_networkstatus(
vote_routerstatus_t *vrs;
routerstatus_t *rs;
int idx, n_rs, n_vrs;
- char *v1_text=NULL, *v2_text=NULL, *v3_text=NULL, *consensus_text=NULL, *cp;
+ char *v1_text=NULL, *v2_text=NULL, *v3_text=NULL, *consensus_text=NULL,
+*cp=NULL;
smartlist_t *votes = smartlist_new();
/* For generating the two other consensuses. */
@@ -1648,6 +1649,7 @@ test_a_networkstatus(
}
done:
+ tor_free(cp);
smartlist_free(votes);
tor_free(v1_text);
tor_free(v2_text);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.4] make EACCES survivable too.
commit e0c8031516852143fb82d8fee91a0f4c576c7418 Author: Nick Mathewson ni...@torproject.org Date: Mon Feb 10 15:06:10 2014 -0500 make EACCES survivable too. --- src/or/reasons.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/reasons.c b/src/or/reasons.c index fc31a43..6eb2643 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -174,11 +174,12 @@ errno_to_stream_end_reason(int e) S_CASE(ENOTSOCK): S_CASE(EPROTONOSUPPORT): S_CASE(EAFNOSUPPORT): -E_CASE(EACCES): S_CASE(ENOTCONN): return END_STREAM_REASON_INTERNAL; S_CASE(ENETUNREACH): S_CASE(EHOSTUNREACH): +E_CASE(EACCES): +E_CASE(EPERM): return END_STREAM_REASON_NOROUTE; S_CASE(ECONNREFUSED): return END_STREAM_REASON_CONNECTREFUSED; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.4] update changes file
commit 0844a262a247d08673040813e2949bc0202d42e4 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 18:57:38 2014 -0500 update changes file --- changes/10777_netunreach |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/10777_netunreach b/changes/10777_netunreach index 369774f..8991814 100644 --- a/changes/10777_netunreach +++ b/changes/10777_netunreach @@ -1,7 +1,7 @@ - Minor bugfixes: -- Treat ENETUNRECH at an exit node as a NOROUTE error, not an - INTERNAL error, since it can apparently happen when trying to - connect to the wrong sort of netblocks. Fixes a part of bug 10777; - bugfix on 0.1.0.1-rc. +- Treat ENETUNREACH, EACCES, and EPERM at an exit node as a + NOROUTE error, not an INTERNAL error, since they can apparently + happen when trying to connect to the wrong sort of + netblocks. Fixes a part of bug 10777; bugfix on 0.1.0.1-rc. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.4] Don't treat END_STREAM_REASON_INTERNAL as total circuit failure
commit b15f75b63266742aa6aa358c553799a31f0b350e
Author: Nick Mathewson ni...@torproject.org
Date: Sun Feb 9 21:35:14 2014 -0500
Don't treat END_STREAM_REASON_INTERNAL as total circuit failure
It can happen because we sent something that got an ENETUNREACH
response.
Bugfix on 0.2.4.8-alpha; fixes a part of bug 10777.
---
changes/bug10777_internal_024 |4
src/or/relay.c|6 --
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changes/bug10777_internal_024 b/changes/bug10777_internal_024
new file mode 100644
index 000..4544147
--- /dev/null
+++ b/changes/bug10777_internal_024
@@ -0,0 +1,4 @@
+ o Major bugfixes:
+- Do not treat END_STREAM_REASON_INTERNAL as indicating a definite
+ circuit failure, since it could also indicate an ENETUNREACH
+ error. Fixes part of bug 10777; bugfix on 0.2.4.8-alpha.
diff --git a/src/or/relay.c b/src/or/relay.c
index 63119cb..57633f8 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -731,13 +731,15 @@ connection_ap_process_end_not_open(
if (rh-length 0) {
if (reason == END_STREAM_REASON_TORPROTOCOL ||
-reason == END_STREAM_REASON_INTERNAL ||
reason == END_STREAM_REASON_DESTROY) {
- /* All three of these reasons could mean a failed tag
+ /* Both of these reasons could mean a failed tag
* hit the exit and it complained. Do not probe.
* Fail the circuit. */
circ-path_state = PATH_STATE_USE_FAILED;
return -END_CIRC_REASON_TORPROTOCOL;
+} else if (reason == END_STREAM_REASON_INTERNAL) {
+ /* We can't infer success or failure, since older Tors report
+ * ENETUNREACH as END_STREAM_REASON_INTERNAL. */
} else {
/* Path bias: If we get a valid reason code from the exit,
* it wasn't due to tagging.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.4] Merge branch 'bug10777_netunreach_024' into maint-0.2.4
commit 91d4bb0b000e1bdaf8569339a9b843c50e13e47e Merge: 8836c1e 0844a26 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 18:57:55 2014 -0500 Merge branch 'bug10777_netunreach_024' into maint-0.2.4 changes/10777_netunreach |7 +++ src/or/reasons.c |5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4
commit 8836c1ee2f460422a688781c79760652524c3d6e Merge: 7f6aa78 b15f75b Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 18:55:26 2014 -0500 Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4 changes/bug10777_internal_024 |4 src/or/relay.c|6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.4] Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL.
commit f5d32c08ba0b7307873324f8b24c4142523c1155 Author: Nick Mathewson ni...@torproject.org Date: Sun Feb 9 21:30:23 2014 -0500 Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL. Found by cypherpunks; fix for a part of bug 10777; bugfix on 0.1.0.1-rc. --- changes/10777_netunreach |7 +++ src/or/reasons.c |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/10777_netunreach b/changes/10777_netunreach new file mode 100644 index 000..369774f --- /dev/null +++ b/changes/10777_netunreach @@ -0,0 +1,7 @@ + - Minor bugfixes: + +- Treat ENETUNRECH at an exit node as a NOROUTE error, not an + INTERNAL error, since it can apparently happen when trying to + connect to the wrong sort of netblocks. Fixes a part of bug 10777; + bugfix on 0.1.0.1-rc. + diff --git a/src/or/reasons.c b/src/or/reasons.c index 637f8cd..fc31a43 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -176,8 +176,8 @@ errno_to_stream_end_reason(int e) S_CASE(EAFNOSUPPORT): E_CASE(EACCES): S_CASE(ENOTCONN): -S_CASE(ENETUNREACH): return END_STREAM_REASON_INTERNAL; +S_CASE(ENETUNREACH): S_CASE(EHOSTUNREACH): return END_STREAM_REASON_NOROUTE; S_CASE(ECONNREFUSED): ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4
commit 8836c1ee2f460422a688781c79760652524c3d6e Merge: 7f6aa78 b15f75b Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 18:55:26 2014 -0500 Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4 changes/bug10777_internal_024 |4 src/or/relay.c|6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'bug10777_netunreach_024' into maint-0.2.4
commit 91d4bb0b000e1bdaf8569339a9b843c50e13e47e Merge: 8836c1e 0844a26 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 18:57:55 2014 -0500 Merge branch 'bug10777_netunreach_024' into maint-0.2.4 changes/10777_netunreach |7 +++ src/or/reasons.c |5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Don't treat END_STREAM_REASON_INTERNAL as total circuit failure
commit b15f75b63266742aa6aa358c553799a31f0b350e
Author: Nick Mathewson ni...@torproject.org
Date: Sun Feb 9 21:35:14 2014 -0500
Don't treat END_STREAM_REASON_INTERNAL as total circuit failure
It can happen because we sent something that got an ENETUNREACH
response.
Bugfix on 0.2.4.8-alpha; fixes a part of bug 10777.
---
changes/bug10777_internal_024 |4
src/or/relay.c|6 --
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changes/bug10777_internal_024 b/changes/bug10777_internal_024
new file mode 100644
index 000..4544147
--- /dev/null
+++ b/changes/bug10777_internal_024
@@ -0,0 +1,4 @@
+ o Major bugfixes:
+- Do not treat END_STREAM_REASON_INTERNAL as indicating a definite
+ circuit failure, since it could also indicate an ENETUNREACH
+ error. Fixes part of bug 10777; bugfix on 0.2.4.8-alpha.
diff --git a/src/or/relay.c b/src/or/relay.c
index 63119cb..57633f8 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -731,13 +731,15 @@ connection_ap_process_end_not_open(
if (rh-length 0) {
if (reason == END_STREAM_REASON_TORPROTOCOL ||
-reason == END_STREAM_REASON_INTERNAL ||
reason == END_STREAM_REASON_DESTROY) {
- /* All three of these reasons could mean a failed tag
+ /* Both of these reasons could mean a failed tag
* hit the exit and it complained. Do not probe.
* Fail the circuit. */
circ-path_state = PATH_STATE_USE_FAILED;
return -END_CIRC_REASON_TORPROTOCOL;
+} else if (reason == END_STREAM_REASON_INTERNAL) {
+ /* We can't infer success or failure, since older Tors report
+ * ENETUNREACH as END_STREAM_REASON_INTERNAL. */
} else {
/* Path bias: If we get a valid reason code from the exit,
* it wasn't due to tagging.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL.
commit f5d32c08ba0b7307873324f8b24c4142523c1155 Author: Nick Mathewson ni...@torproject.org Date: Sun Feb 9 21:30:23 2014 -0500 Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL. Found by cypherpunks; fix for a part of bug 10777; bugfix on 0.1.0.1-rc. --- changes/10777_netunreach |7 +++ src/or/reasons.c |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/10777_netunreach b/changes/10777_netunreach new file mode 100644 index 000..369774f --- /dev/null +++ b/changes/10777_netunreach @@ -0,0 +1,7 @@ + - Minor bugfixes: + +- Treat ENETUNRECH at an exit node as a NOROUTE error, not an + INTERNAL error, since it can apparently happen when trying to + connect to the wrong sort of netblocks. Fixes a part of bug 10777; + bugfix on 0.1.0.1-rc. + diff --git a/src/or/reasons.c b/src/or/reasons.c index 637f8cd..fc31a43 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -176,8 +176,8 @@ errno_to_stream_end_reason(int e) S_CASE(EAFNOSUPPORT): E_CASE(EACCES): S_CASE(ENOTCONN): -S_CASE(ENETUNREACH): return END_STREAM_REASON_INTERNAL; +S_CASE(ENETUNREACH): S_CASE(EHOSTUNREACH): return END_STREAM_REASON_NOROUTE; S_CASE(ECONNREFUSED): ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] update changes file
commit 0844a262a247d08673040813e2949bc0202d42e4 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 18:57:38 2014 -0500 update changes file --- changes/10777_netunreach |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/10777_netunreach b/changes/10777_netunreach index 369774f..8991814 100644 --- a/changes/10777_netunreach +++ b/changes/10777_netunreach @@ -1,7 +1,7 @@ - Minor bugfixes: -- Treat ENETUNRECH at an exit node as a NOROUTE error, not an - INTERNAL error, since it can apparently happen when trying to - connect to the wrong sort of netblocks. Fixes a part of bug 10777; - bugfix on 0.1.0.1-rc. +- Treat ENETUNREACH, EACCES, and EPERM at an exit node as a + NOROUTE error, not an INTERNAL error, since they can apparently + happen when trying to connect to the wrong sort of + netblocks. Fixes a part of bug 10777; bugfix on 0.1.0.1-rc. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] make EACCES survivable too.
commit e0c8031516852143fb82d8fee91a0f4c576c7418 Author: Nick Mathewson ni...@torproject.org Date: Mon Feb 10 15:06:10 2014 -0500 make EACCES survivable too. --- src/or/reasons.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/reasons.c b/src/or/reasons.c index fc31a43..6eb2643 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -174,11 +174,12 @@ errno_to_stream_end_reason(int e) S_CASE(ENOTSOCK): S_CASE(EPROTONOSUPPORT): S_CASE(EAFNOSUPPORT): -E_CASE(EACCES): S_CASE(ENOTCONN): return END_STREAM_REASON_INTERNAL; S_CASE(ENETUNREACH): S_CASE(EHOSTUNREACH): +E_CASE(EACCES): +E_CASE(EPERM): return END_STREAM_REASON_NOROUTE; S_CASE(ECONNREFUSED): return END_STREAM_REASON_CONNECTREFUSED; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
commit 0ee449ca92dc7f25517a63b63f4d521fdd48410b Merge: c3720c0 91d4bb0 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 11 18:58:58 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' changes/10777_netunreach |7 +++ changes/bug10777_internal_024 |4 src/or/reasons.c |5 +++-- src/or/relay.c|6 -- 4 files changed, 18 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r26610: {website} remove dwfb bottom banner (website/trunk/include)
Author: phobos Date: 2014-02-12 02:31:01 + (Wed, 12 Feb 2014) New Revision: 26610 Modified: website/trunk/include/foot.wmi Log: remove dwfb bottom banner Modified: website/trunk/include/foot.wmi === --- website/trunk/include/foot.wmi 2014-02-11 21:12:00 UTC (rev 26609) +++ website/trunk/include/foot.wmi 2014-02-12 02:31:01 UTC (rev 26610) @@ -121,14 +121,5 @@ /div !-- END WRAP -- - -!-- thedaywefightback banner -- -a href=https://thedaywefightback.org; -div style=background:black;height:100px;width:100%;bottom:0;position:fixed;text-align:center; -img height=110px width=auto src=$(IMGROOT)/thedaywefightback.png -/div -/a -!-- /thedaywefightback -- - /body /html ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
