Nick Mathewson
b40f9967fa
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-29 11:17:31 -04:00
Nick Mathewson
0ea622aa3a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-29 11:17:31 -04:00
Nick Mathewson
810152b20f
Merge branch 'maint-0.3.4'
2018-08-29 11:17:31 -04:00
Mike Perry
ce894e20b5
Ticket #25573 : Count TRUNCATED cells.
...
TRUNCATED cells were ignored while in path bias. Now they are obeyed, and
cause us to tear down the circuit. The actual impact is minimal, since we
would just wait around for a probe that would never arrive before.
This commit changes client behavior.
2018-08-29 04:12:15 +00:00
Mike Perry
144647031a
Ticket #25573 : Check half-opened stream ids when choosing a new one
...
Avoid data corrupton by avoiding mixing up old stream ids with new ones.
This commit changes client behavior.
2018-08-29 04:12:15 +00:00
Mike Perry
c56f63eadb
Ticket #25573 : Track half-closed stream ids
...
We allow their CONNECTEDs, RESOLVEDs, ENDs, SENDMEs, and DATA cells to not
count as dropped until the windows are empty, or we get an END.
This commit does not change behavior. It only changes CIRC_BW event field
values.
2018-08-29 04:12:09 +00:00
Nick Mathewson
3d7a705d3a
Merge remote-tracking branch 'onionk/prototest1'
2018-08-28 21:32:46 -04:00
teor
541b89b061
Test: avoid spurious failures in make test-network-all
...
Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.
Fixes bug 27295; bugfix on 0.2.7.3-rc.
2018-08-29 10:47:20 +10:00
teor
3e298633ca
Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am
...
Part of 27295.
2018-08-29 10:47:05 +10:00
Mike Perry
dac7d92918
Mark smartlist_bsearch as taking a const list.
...
It does not modify the actual list.
2018-08-29 00:03:41 +00:00
Roger Dingledine
721763126e
fix man page issue noticed during #26367 review
...
and fix two other nearby issues while i'm there
2018-08-28 16:28:45 -04:00
Nick Mathewson
b4b8fa4899
Set the file encoding in checkIncludes.py with Python3
2018-08-28 16:25:54 -04:00
Roger Dingledine
6da8c6e9a5
make a comment more right
...
(from #20874 fix)
2018-08-28 16:13:58 -04:00
Nick Mathewson
76843639e5
Merge remote-tracking branch 'teor/bug22747'
2018-08-28 16:12:01 -04:00
Nick Mathewson
b26db5dddb
Merge remote-tracking branch 'onionk/connection-comments1'
2018-08-28 16:07:46 -04:00
Nick Mathewson
48632455a5
Merge branch 'bug26367_035_01'
2018-08-28 16:02:04 -04:00
David Goulet
8f13c3d3ed
hs: Remove rend_client_non_anonymous_mode_enabled
...
The removal of Tor2Web made this function useless.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-08-28 16:01:57 -04:00
David Goulet
f661d856fd
hs: Remove rend_client_allow_non_anonymous_connection
...
By removing Tor2Web, there is no way a client can be non anonymous so we
remove that function and the callsites.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-08-28 16:01:57 -04:00
David Goulet
67cd67611c
circ: Remove useless param from cannibalization function
...
Because we just removed Tor2web support, the need_specific_rp is not needed
anymore when cannibalizing a circuit.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-08-28 16:01:57 -04:00
David Goulet
4976eca826
hs: Render obsolete Tor2web
...
Remove support for Tor2web in the code and build system. At this commit, tor
doesn't have Tor2web support anymore.
Ref: https://lists.torproject.org/pipermail/tor-dev/2018-July/013295.html
Close #26367
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-08-28 16:01:57 -04:00
Nick Mathewson
b1d32a9223
Merge remote-tracking branch 'dgoulet/ticket27215_035_01'
2018-08-28 16:00:45 -04:00
David Goulet
4e2dcda092
fixup! hs: Change default version from 2 to 3
2018-08-28 15:58:28 -04:00
Nick Mathewson
219f6ea516
Fix log.c comments about assert vs tor_assert vs raw_assert.
2018-08-28 15:58:16 -04:00
Nick Mathewson
2bc4c55d7d
Merge remote-tracking branch 'tor-github/pr/245'
2018-08-28 15:44:06 -04:00
Nick Mathewson
82d758afa8
Merge remote-tracking branch 'tor-github/pr/279'
2018-08-28 15:24:30 -04:00
Nick Mathewson
3b960df4f9
Merge branch 'bug26896_034'
2018-08-28 12:35:50 -04:00
rl1987
326b510bae
manpage: Warn users about comma-separating addr-port pairs
2018-08-28 18:49:34 +03:00
rl1987
3890ad2578
Stricter HiddenServicePort parsing
2018-08-28 18:32:31 +03:00
David Goulet
d9bfc9e2e3
fixup! hs: Learn service version by trying to load the keys
2018-08-28 08:36:28 -04:00
Nick Mathewson
64c3c6a790
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-27 09:39:08 -04:00
Nick Mathewson
0483f7f64c
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-27 09:39:08 -04:00
Nick Mathewson
103dd68ba8
Merge branch 'maint-0.3.4'
2018-08-27 09:39:08 -04:00
teor
70a07fa90b
When running make test-network-all, use the mixed+hs-v2 network
...
No behaviour change.
A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.
Fixes bug 27345; bugfix on 0.3.2.1-alpha.
2018-08-27 23:07:20 +10:00
cypherpunks
0cd72a2833
core/mainloop: more comments documenting connection.c
2018-08-27 01:32:34 +00:00
cypherpunks
309961138b
core/mainloop: fix documentation of connection_handle_write_impl()
...
Inaccurate since d9746bd468f551d1ada57d962b20eddd15256ce9.
2018-08-27 01:07:01 +00:00
Nick Mathewson
2e54c80aec
Merge branch 'maint-0.3.4'
...
"ours" to avoid version bump.
2018-08-24 16:50:24 -04:00
Nick Mathewson
81175ecafd
Forward-port changelog from 0.3.4.7-rc
2018-08-24 16:50:12 -04:00
Nick Mathewson
4c1c818ffa
Update to 0.3.4.7-rc-dev
2018-08-24 16:49:56 -04:00
Nick Mathewson
bb65b53966
Fix a compilation warning on i386 with clang
2018-08-24 16:13:30 -04:00
Nick Mathewson
7217bdacb5
Merge remote-tracking branch 'tor-github/pr/289'
2018-08-24 12:57:18 -04:00
Nick Mathewson
4c3b43604b
Merge remote-tracking branch 'teor/ticket27211'
2018-08-24 12:45:42 -04:00
Nick Mathewson
622231ce2e
Merge remote-tracking branch 'teor/bug27237'
2018-08-24 12:44:46 -04:00
Nick Mathewson
b1d0fa04fb
Merge branch 'maint-0.3.4'
2018-08-24 12:35:26 -04:00
Nick Mathewson
658171318f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-24 12:35:23 -04:00
Nick Mathewson
33e4e30d0a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-24 12:32:10 -04:00
Nick Mathewson
98e1a1d106
Merge branch 'ticket27286_032_v2' into maint-0.3.2
2018-08-24 12:32:06 -04:00
Nick Mathewson
14be9cba4e
Update the protocol versions recommendations to remove LinkAuth=1
...
LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.
As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning. Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.
Closes ticket 27286
2018-08-24 12:31:01 -04:00
Nick Mathewson
08a1619e7f
Merge branch 'maint-0.3.4'
2018-08-24 12:05:39 -04:00
teor
dd27e17ccc
Bootstrap: add some extra logging
...
Diagnostics for 27236.
2018-08-24 12:05:36 -04:00
teor
3ebbc1c84d
Bootstrap: allow internal-only onion service networks to bootstrap
...
This fix requires chutney's 27230 fix to bridge client bootstrap.
Part of 27236.
2018-08-24 12:05:29 -04:00