September 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'teor/autodetect-chutney-path'
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit fe4273fdc1527a129f62242767d7d83b9fb7bcd2 Merge: 569368e d9948df Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 09:17:24 2015 -0400 Merge remote-tracking branch 'teor/autodetect-chutney-path' Makefile.am | 11 ++++++++--- changes/autodetect-chutney-path | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-)

1 0

[chutney/master] Add bridges+hs network to test bridges and hidden services together
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit 396da926fd49b632577beaa571f13ec3a1a13310 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Sep 2 00:34:42 2015 +1000 Add bridges+hs network to test bridges and hidden services together This network allows non-IPv6 systems to test almost all tor functionality. --- networks/bridges+hs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/networks/bridges+hs b/networks/bridges+hs new file mode 100644 index 0000000..8cf0ec6 --- /dev/null +++ b/networks/bridges+hs @@ -0,0 +1,21 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, + relay=1, torrc="bridgeauthority.tmpl") +Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") +BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") +HS = Node(tag="h", hs=1, torrc="hs.tmpl") + +# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag +# in 0.2.6 +# We need 5 authorities/relays/exits to ensure we can build HS connections +NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ + ExitRelay.getN(4) + \ + Bridge.getN(1) + \ + Client.getN(1) + BridgeClient.getN(1) + \ + HS.getN(1) + +ConfigureNodes(NODES)

1 0

[tor/master] Enable hidden service statistics by default
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit d40358d91ed62590a84730fb2713b8a0115c5adf Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Sep 2 13:52:56 2015 +0200 Enable hidden service statistics by default HiddenServiceStatistics option is now set to "1" by default. Fixes #15254 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/ticket15254-hs-stats-default | 4 ++++ doc/tor.1.txt | 2 +- src/or/config.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/ticket15254-hs-stats-default b/changes/ticket15254-hs-stats-default new file mode 100644 index 0000000..14913ea --- /dev/null +++ b/changes/ticket15254-hs-stats-default @@ -0,0 +1,4 @@ + o Hidden Service Statistics + - Turn on hidden service statistics collection by setting the torrc + option HiddenServiceStatistics to "1" by default. Closes ticket + #15254. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index af99570..735fa23 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1848,7 +1848,7 @@ is non-zero): statistics on its role as hidden-service directory, introduction point, or rendezvous point to disk every 24 hours. If ExtraInfoStatistics is also enabled, these statistics are further - published to the directory authorities. (Default: 0) + published to the directory authorities. (Default: 1) [[ExtraInfoStatistics]] **ExtraInfoStatistics** **0**|**1**:: When this option is enabled, Tor includes previously gathered statistics in diff --git a/src/or/config.c b/src/or/config.c index 6e782de..cb0abab 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -289,7 +289,7 @@ static config_var_t option_vars_[] = { VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceNumIntroductionPoints", LINELIST_S, RendConfigLines, NULL), - V(HiddenServiceStatistics, BOOL, "0"), + V(HiddenServiceStatistics, BOOL, "1"), V(HidServAuth, LINELIST, NULL), V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"), V(CloseHSServiceRendCircuitsImmediatelyOnTimeout, BOOL, "0"),

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug15254_027_01'
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit f273295cadd1afe03c0e839ce51f0d00bf2b43d6 Merge: db5a930 d40358d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 09:05:55 2015 -0400 Merge remote-tracking branch 'dgoulet/bug15254_027_01' changes/ticket15254-hs-stats-default | 4 ++++ doc/tor.1.txt | 2 +- src/or/config.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)

1 0

[webwml/master] update debian stuff more
by sebastian＠torproject.org 02 Sep '15

02 Sep '15

commit 2da9a2d27fe7af44ee6b2f234d18696bf4c55b70 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Sep 2 14:53:42 2015 +0200 update debian stuff more --- docs/en/debian.wml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 3061849..575a2b6 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -20,8 +20,7 @@ var software = { 'saucy': [ 'saucy'], 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, - 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], - 'wheezy': [ 'wheezy' ], + 'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], 'lucid': [ 'lucid'], @@ -39,8 +38,7 @@ var software = { 'saucy': [ 'saucy'], 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, - 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], - 'wheezy': [ 'wheezy' ], + 'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], 'lucid': [ 'lucid'], @@ -228,7 +226,7 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T <blockquote> I run <select id="distrib" onchange="update()"> -<option value="squeeze">Debian oldstable (Squeeze)</option> +<option value="squeeze">Debian oldoldstable (Squeeze)</option> <option value="wheezy">Debian oldstable (Wheezy)</option> <option value="jessie" selected="selected">Debian (Jessie)</option> <option value="sid">Debian unstable (sid)</option>

1 0

[tor/master] Remove remaining references to "nulterminate" in comments
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit 4cff437a0a934e3a6712f43bd56ddfd4d2be0a80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 08:50:26 2015 -0400 Remove remaining references to "nulterminate" in comments Thanks to Roger for spotting this! --- src/or/buffers.c | 5 +---- src/test/test_buffers.c | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 01a1b1f..cc2f6f4 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -178,13 +178,10 @@ preferred_chunk_size(size_t target) /** Collapse data from the first N chunks from buf into buf->head, * growing it as necessary, until buf->head has the first bytes bytes * of data from the buffer, or until buf->head has all the data in buf. - * - * If nulterminate is true, ensure that there is a 0 byte in - * buf->head->mem right after all the data. */ + */ STATIC void buf_pullup(buf_t *buf, size_t bytes) { - /* XXXX nothing uses nulterminate; remove it. */ chunk_t *dest, *src; size_t capacity; if (!buf->head) diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 4b6e539..29ee408 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -206,9 +206,6 @@ test_buffer_pullup(void *arg) stuff = tor_malloc(16384); tmp = tor_malloc(16384); - /* Note: this test doesn't check the nulterminate argument to buf_pullup, - since nothing actually uses it. We should remove it some time. */ - buf = buf_new_with_capacity(3000); /* rounds up to next power of 2. */ tt_assert(buf);

1 0

[tor/master] correct the doc for find_rp_for_intro.
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit db5a9302c17b5bed91987fdeaaa0377e46e4811e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 08:51:24 2015 -0400 correct the doc for find_rp_for_intro. Thanks to Roger for spotting this! --- src/or/rendservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index f3a09dd..8ba5327 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1762,7 +1762,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, /** Given a parsed and decrypted INTRODUCE2, find the rendezvous point or * return NULL and an error string if we can't. Return a newly allocated - * extend_info_t* for the introduction point. */ + * extend_info_t* for the rendezvous point. */ static extend_info_t * find_rp_for_intro(const rend_intro_cell_t *intro, char **err_msg_out)

1 0

[tor/master] Include dns_structs.h in tarball
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit 7153cd509457656e8ca5fff8606abd5ac882d962 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 08:45:12 2015 -0400 Include dns_structs.h in tarball --- src/or/include.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/include.am b/src/or/include.am index 959b26d..7b12b56 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -153,6 +153,7 @@ ORHEADERS = \ src/or/dirserv.h \ src/or/dirvote.h \ src/or/dns.h \ + src/or/dns_structs.h \ src/or/dnsserv.h \ src/or/eventdns_tor.h \ src/or/ext_orport.h \

1 0

[tor-browser-bundle/maint-5.0] Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit bc17a40f050335b9dbfaff73ac0233e48ead546e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:50:47 2015 +0200 Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR --- gitian/get-tb-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index bc3181c..07c5962 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -44,7 +44,7 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { next unless $tags{$commit}; print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", - substr($commit, 0, 12), "\n"; + substr($current_commit, 0, 12), "\n"; print "TORBROWSER_SYMLINK_VERSION=0\n"; exit 0; }

1 0

[tor-browser-bundle/master] Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit e594dfac1fdb2bf32a51a0020e59fa1a9826f6ba Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:50:47 2015 +0200 Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR --- gitian/get-tb-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index bc3181c..07c5962 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -44,7 +44,7 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { next unless $tags{$commit}; print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", - substr($commit, 0, 12), "\n"; + substr($current_commit, 0, 12), "\n"; print "TORBROWSER_SYMLINK_VERSION=0\n"; exit 0; }

1 0