Mike Perry
c525135dac
Bug 29034: Cleanup hs circuitmap when purpose changes.
...
Leave the other rend and hs_ident data around until circuit free, since code
may still try to inspect it after marking the circuit for close. The
circuitmap is the important thing to clean up, since repurposed
intropoints must be removed from this map to ensure validity.
2019-06-05 11:50:44 -07:00
Mike Perry
31c34f6524
Revert "hs: Implement a helper to repurpose a circuit"
...
This reverts commit 3789f22bcb
2019-06-05 11:38:01 -07:00
Mike Perry
a42131bf48
Revert "test: Add test_hs_circ.c for HS circuit testing"
...
This reverts commit 41b94722e5
2019-06-05 11:37:32 -07:00
Neel Chauhan
27e067df4f
Add missing newline after decode_intro_points() closing bracket
2019-06-05 12:50:01 -04:00
George Kadianakis
917e4e9eae
Don't access rend data after a circuit has been marked for close.
...
This can cause issues if the circuit was repurposed into a padding circuit
instead of closing, since in that case we will wipe off the rend_data.
2019-06-05 18:19:44 +03:00
Nick Mathewson
7f341d6482
minor changelog edits
2019-06-05 09:43:43 -04:00
Nick Mathewson
892a313b6a
Replace a missing end-of-comment string
...
This happened when I went to fix long lines after running "make
autostyle".
2019-06-05 09:35:45 -04:00
Nick Mathewson
2926f49b24
Regenerate practracker excpetions file
2019-06-05 09:34:14 -04:00
Nick Mathewson
60213a3621
Run "make autostyle."
2019-06-05 09:33:35 -04:00
Nick Mathewson
d1b02456c1
Bump to 0.4.1.2-alpha
2019-06-05 09:25:21 -04:00
Nick Mathewson
d2de899bf4
Rewrap the changelog
2019-06-05 09:24:42 -04:00
Nick Mathewson
0982d01369
Start a changelog for 0.4.1.2-alpha
2019-06-05 09:24:18 -04:00
Nick Mathewson
ae490189f8
practracker update
2019-06-05 09:06:43 -04:00
Nick Mathewson
b39a8d315d
Merge remote-tracking branch 'tor-github/pr/1053'
2019-06-05 09:04:09 -04:00
Nick Mathewson
0c16ec4c07
Merge branch 'bug30286_2_squashed'
2019-06-05 08:32:39 -04:00
rl1987
e8aab46a3a
Document TOR_UPSTREAM_REMOTE_NAME env variable
2019-06-05 08:29:55 -04:00
George Kadianakis
8cb6b2b9ab
Fix typo in #29670 changes file.
2019-06-05 14:56:28 +03:00
George Kadianakis
99bf3d8e14
Merge branch 'tor-github/pr/1072'
2019-06-05 14:40:38 +03:00
David Goulet
a63c5f844b
Merge branch 'tor-github/pr/1067'
2019-06-04 09:57:03 -04:00
Nick Mathewson
dc5cdde60c
update practracker
2019-06-04 08:29:43 -04:00
Nick Mathewson
4022b6d6b7
Merge branch 'bug29670_035' into bug29670_041
2019-06-04 08:29:05 -04:00
David Goulet
33382184b6
sendme: Do not decrement window in a log_debug()
...
If "Log debug ..." is not set, the decrement never happens. This lead to the
package/deliver window to be out of sync at the stream level and thus breaking
the connection after 50+ cells.
Fixes #30628
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-03 14:31:51 -04:00
Roger Dingledine
180048e013
fix some simple typos
2019-06-01 15:37:51 -04:00
Nick Mathewson
5e594831c7
Practracker excpetions.
2019-05-31 12:41:44 -04:00
Nick Mathewson
fd8beab4dd
Merge branch 'bug29875_035' into bug29875_master
2019-05-31 12:40:43 -04:00
Nick Mathewson
c09e7a4e71
changes file for bug 29875.
2019-05-31 12:39:52 -04:00
Nick Mathewson
8015979eeb
num_bridges_usable(): only count configured bridges.
...
When this function was implemented, it counted all the entry guards
in the bridge set. But this included previously configured bridges,
as well as currently configured ones! Instead, only count the
_filtered_ bridges (ones that are configured and possibly reachable)
as maybe usable.
Fixes bug 29875; bugfix on 0.3.0.1-alpha.
2019-05-31 12:28:42 -04:00
Nick Mathewson
5b3c886584
Consider dir info to have changed when the bridges change
...
Otherwise, we won't realize that we haven't got enough bridge
information to build circuits. Part of a fix for ticket 29875.
2019-05-31 12:27:42 -04:00
David Goulet
41b94722e5
test: Add test_hs_circ.c for HS circuit testing
...
For now, only tests HS circuit repurpose function.
Part of #29034
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-31 10:43:01 -04:00
Nick Mathewson
3c3158f182
Fix some tests for CL_PORT_NO_STREAM_OPTIONS
...
The comment in the tests was correct: this option _was_ inverted wrt
SessionGroup=.
2019-05-31 09:03:20 -04:00
Nick Mathewson
70b85358af
Fix a logic error in deciding whether to accept SessionGroup=
...
Fixes bug 22619; bugfix on 0.2.7.2-alpha
2019-05-31 08:26:10 -04:00
rl1987
5d4b4f948a
Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md
2019-05-31 09:35:19 +03:00
Mike Perry
6263755728
Make some warns into protocol warns
...
I'm not sure I agree with this option.
2019-05-30 16:25:29 -07:00
Mike Perry
9bef75a29a
Bug 30649: Changes file.
2019-05-30 15:28:21 -07:00
Mike Perry
de3eb8c5e4
Bug 30649: Check that machine is absent before warn
2019-05-30 15:28:17 -07:00
George Kadianakis
dd62cb788e
Merge branch 'tor-github/pr/1059'
2019-05-30 21:01:59 +03:00
David Goulet
8dfc8d7063
Merge branch 'tor-github/pr/1057'
2019-05-30 12:58:35 -04:00
Nick Mathewson
8f3430fc28
changes file for 30629
2019-05-30 12:58:12 -04:00
David Goulet
a462ca7cce
Merge branch 'tor-github/pr/1055'
2019-05-30 12:53:52 -04:00
David Goulet
ef9170db4c
Merge branch 'tor-github/pr/1054'
2019-05-30 09:59:21 -04:00
David Goulet
61bd8f428b
Merge branch 'tor-github/pr/1049'
2019-05-30 09:56:18 -04:00
teor
cdda69ca8a
Travis: only run the stem tests that use a tor binary
...
Closes ticket 30694.
2019-05-30 20:05:03 +10:00
George Kadianakis
d8bd98b2fd
Merge branch 'tor-github/pr/1032'
2019-05-29 21:28:04 +03:00
George Kadianakis
70553a9134
Merge branch 'tor-github/pr/1037'
2019-05-29 21:25:32 +03:00
George Kadianakis
650bdca97f
Merge branch 'maint-0.4.0'
2019-05-29 21:20:02 +03:00
George Kadianakis
00108b75d4
Merge branch 'tor-github/pr/924' into maint-0.4.0
2019-05-29 21:19:56 +03:00
Nick Mathewson
ba9b0319b0
Shutdown libevent _after_ the subsystems.
...
This is necessary since shutting down libevent frees some pointer
that the subsystems want to free themselves. A longer term solution
will be to turn the evloop module into a subsystem itself, but for
now it is best to do the minimal fix.
Fixes bug 30629; bugfix on 0.4.1.1-alpha.
2019-05-29 11:25:47 -04:00
Nick Mathewson
5cbd71b977
Make get_proxy_type() connection-specific
...
Previously, we were looking at our global settings to see what kind
of proxy we had. But doing this would sometimes give us the wrong
results when we had ClientTransportPlugin configured but we weren't
using it for a particular connection. In several places in the
code, we had added checks to see if we were _really_ using a PT or
whether we were using a socks proxy, but we had forgotten to do so
in at least once case. Instead, since every time we call this
function we are asking about a single connection, it is probably
best just to make this function connection-specific.
Fixes bug 29670; bugfix on 0.2.6.2-alpha.
2019-05-29 11:00:09 -04:00
Nick Mathewson
2d66250d8a
Remove want_cmddata from HSFETCH, which does not in fact want data
...
This looks a copy-and-paste error to me. Fixes bug 30646; bugfix on
0.4.1.1-alpha.
2019-05-29 10:10:57 -04:00
Nick Mathewson
8f0b29961e
Merge branch 'ticket30561_029' into ticket30561_035
2019-05-29 09:43:20 -04:00
