Roger Dingledine
71daad1692
never say XB, always XBytes
...
fix three more instances in the man page that we forgot to fix
in earlier attempts
2019-10-16 03:31:23 -04:00
teor
11b5946e49
scripts: Fix a git script comment
2019-10-15 13:58:53 +10:00
teor
028987a0a1
scripts: Merge forward test branch _042 into test branch _master
...
Fixes an issue where test branch _041 was merged into _042 and _master.
This issue only affects test branch mode (-t).
2019-10-15 13:36:56 +10:00
Nick Mathewson
dfe7f004df
Merge branch 'design_revision'
2019-10-14 15:56:49 -04:00
Nick Mathewson
6bbeb08f92
Merge branch 'maint-0.4.2'
2019-10-14 15:55:27 -04:00
Nick Mathewson
eebd2d44a1
Merge remote-tracking branch 'tor-github/pr/1393' into maint-0.4.2
2019-10-14 15:55:13 -04:00
Nick Mathewson
1332d3b6fa
doc/HACKING/design: address comments from ahf
2019-10-14 15:53:04 -04:00
Nick Mathewson
358436592b
Edit 01b-collections.md a bit for md and missing content
2019-10-14 15:05:47 -04:00
Nick Mathewson
77accf937e
Edit 01a-memory.md
2019-10-14 15:02:26 -04:00
Nick Mathewson
9201bbd96c
Replace a unicode character which doxygen cannot handle.
...
Merging without review, as this is an editorial fix in a comment.
2019-10-14 14:05:50 -04:00
Nick Mathewson
8ef5d96c2e
Rewrite "common" overview into a "lib" overview.
2019-10-14 13:49:27 -04:00
Nick Mathewson
908070bbd5
Rename common-utils to lib-overview.
2019-10-14 10:59:32 -04:00
Nick Mathewson
1b996b01f6
00-overview.md: Revise to describe intended document structure
2019-10-14 10:58:03 -04:00
Nick Mathewson
78f4e29219
git scripts: add maint/release-0.4.2.
2019-10-11 17:26:34 -04:00
Nick Mathewson
215a6debba
Merge branch 'maint-0.4.2'
...
"Ours" merge to avoid takign ".enable_practracker_in_hooks"
2019-10-11 17:20:54 -04:00
Nick Mathewson
a4790e7d4b
maint-0.4.2: remove ".enable_practracker_in_hooks".
2019-10-11 17:18:55 -04:00
Nick Mathewson
61fe3f448c
Bump master to 0.4.3.0-alpha-dev.
2019-10-11 17:15:04 -04:00
Nick Mathewson
2e5724d153
Merge branch 'ticket31682_042_01_squashed'
2019-10-11 10:21:58 -04:00
Nick Mathewson
46efc0ff35
Correct comment on build_establish_intro_dos_extension
2019-10-11 10:21:45 -04:00
David Goulet
b356b3907a
hs-v3: Fix implicit ssize_t to size_t conversion
...
Found by Coverity.
Fixes #31682
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-11 10:20:36 -04:00
Nick Mathewson
0d82a8be77
Merge remote-tracking branch 'tor-github/pr/1394'
2019-10-09 16:44:12 -04:00
Nick Mathewson
ab064cf762
Merge remote-tracking branch 'tor-github/pr/1399'
2019-10-09 16:37:47 -04:00
Nick Mathewson
755f001600
Merge remote-tracking branch 'tor-github/pr/1401'
2019-10-09 16:29:46 -04:00
Nick Mathewson
99809834a7
Merge branch 'bug30344_squashed_035'
2019-10-09 16:26:31 -04:00
George Kadianakis
841cff6e4f
Stop libevent from reading data from closed connections.
...
Code adapted from Rob's proposed patch in #30344 .
Also add a comment in connection_mark_for_close_internal_() on why we should
not be adding extra code there without a very good reason.
2019-10-09 16:24:49 -04:00
Neel Chauhan
7c1b2fceb7
test: New behavior on IP retry for HSv3
...
Unit test for #31652 where if we are over the retry limit for the IP but we
have an established circuit, we don't remove the IP.
Part of #31652
2019-10-08 17:02:47 -04:00
David Goulet
f50de3a918
hs-v3: Do not remove intro point if circuit exists
...
When considering introduction point of a service's descriptor, do not remove
an intro point that has an established or pending circuit.
Fixes #31652
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-08 17:02:47 -04:00
David Goulet
1f60337da4
Merge branch 'tor-github/pr/1381'
2019-10-08 14:49:39 -04:00
George Kadianakis
081bd37315
Fix flapping of test_service_intro_point() unittest.
2019-10-08 19:00:43 +03:00
Nick Mathewson
7a26f14a37
Merge remote-tracking branch 'tor-github/pr/1317'
2019-10-07 10:23:44 -04:00
Nick Mathewson
56e8d84ea3
Merge branch 'ticket31548_035_01_squashed'
2019-10-07 10:21:40 -04:00
David Goulet
984a28f3e5
hs-v3: Make service pick the exact amount of intro points
...
When encoding introduction points, we were not checking if that intro points
had an established circuit.
When botting up, the service will pick, by default, 3 + 2 intro points and the
first 3 that establish, we use them and upload the descriptor.
However, the intro point is removed from the service descriptor list only when
the circuit has opened and we see that we have already enough intro points, it
is then removed.
But it is possible that the service establishes 3 intro points successfully
before the other(s) have even opened yet.
This lead to the service encoding extra intro points in the descriptor even
though the circuit is not opened or might never establish (#31561 ).
Fixes #31548
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-07 10:20:09 -04:00
Nick Mathewson
58b87a2c59
Merge remote-tracking branch 'tor-github/pr/1379'
2019-10-07 10:15:46 -04:00
Nick Mathewson
52194c8681
Merge remote-tracking branch 'tor-github/pr/1390'
2019-10-07 10:13:32 -04:00
Nick Mathewson
5fb5019a94
bump to 0.4.2.2-alpha-dev
2019-10-07 09:32:26 -04:00
Roger Dingledine
aa56465934
fix typo in how-to-review guidelines
2019-10-07 00:48:11 -04:00
Nick Mathewson
fdfb4b196b
Use {mock,unmock}_hostname_resolver() in relevant tests
...
These tests all invoke the hostname resolver in one way or another,
and therefore potentially block if our DNS server is missing,
absent, or extremely slow. Closes ticket 31841.
2019-10-04 08:03:19 -04:00
Nick Mathewson
4a0749596c
Add a mock replacement for blocking hostname resolution
...
Based on examination of our tests, this mock function accepts
"localhost" and "torproject.org", and rejects everything else.
2019-10-04 08:03:19 -04:00
Nick Mathewson
9c24ceeb3f
Make tor_addr_lookup_host_impl mockable.
2019-10-04 08:02:56 -04:00
teor
ff304f3be7
tls: Log TLS read buffer length bugs once
...
Rather than filling the logs with similar warnings.
Fixes bug 31939; bugfix on 0.3.0.4-rc.
2019-10-04 12:33:34 +10:00
teor
e5b8bd38ab
Merge remote-tracking branch 'tor-github/pr/1392'
2019-10-04 11:26:43 +10:00
David Goulet
52b7ae71b3
hs: ADD_ONION NEW:BEST now defaults to ED25519-V3
...
From RSA1024 (v2) to v3 now.
Closes #29669
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-03 15:43:03 -04:00
Nick Mathewson
c8df2c7205
Pick a release date for 0.4.2.2-alpha
2019-10-03 14:58:51 -04:00
Nick Mathewson
db976cd927
Light edits on 0.4.2.2-alpha changelog.
2019-10-03 12:34:21 -04:00
Nick Mathewson
5ae1a574dc
lightly sort changelog entries
2019-10-03 12:24:47 -04:00
Nick Mathewson
0ef59dd09b
Run format_changelog
2019-10-03 12:23:05 -04:00
Nick Mathewson
519afb0ece
Sort changes entries into a changelog for 0.4.2.2-alpha
2019-10-03 12:22:46 -04:00
George Kadianakis
9309eaf8ea
Merge branch 'tor-github/pr/1377'
2019-10-03 19:13:57 +03:00
George Kadianakis
3778b97cab
Merge branch 'tor-github/pr/1276'
2019-10-03 19:13:02 +03:00
Nick Mathewson
49d6990cae
Unit tests for dirserv_reject_tor_version().
2019-10-03 19:12:52 +03:00