George Kadianakis
646f7a9a94
Merge branch 'ticket30687_042_01'
2019-06-11 14:02:33 +03:00
David Goulet
7cf9d54e6d
token-bucket: Implement a single counter object
...
Closes #30687 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11 14:02:22 +03:00
George Kadianakis
b83dba7cb0
Merge branch 'maint-0.4.1'
2019-06-11 13:48:16 +03:00
George Kadianakis
eab9dc06af
Merge branch 'tor-github/pr/1065' into maint-0.4.1
2019-06-11 13:48:10 +03:00
Nick Mathewson
cfa943f140
Merge branch 'maint-0.4.1'
2019-06-10 18:44:31 -04:00
Nick Mathewson
5b07ff4011
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:44:31 -04:00
Nick Mathewson
c8447f95ec
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
2019-06-10 18:44:20 -04:00
Nick Mathewson
d6b411a351
Merge branch 'maint-0.4.1'
2019-06-10 18:33:26 -04:00
Nick Mathewson
6a72cc2598
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:33:26 -04:00
Nick Mathewson
df8e2bbc0f
Merge remote-tracking branch 'tor-github/pr/1038'
2019-06-10 09:38:40 -04:00
Nick Mathewson
765e4364d9
Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
2019-06-10 09:37:17 -04:00
teor
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
2019-06-10 20:50:53 +10:00
teor
be0a4be276
Travis: Skip test_rebind on macOS builds
...
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.
Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.
Fixes bug 30713; bugfix on 0.3.5.1-alpha.
2019-06-10 20:49:59 +10:00
teor
d761c3ca6d
Travis: allow the test-stem job to fail
...
Allow the test-stem job to fail in Travis, because it sometimes hangs.
Fixes bug 30744; bugfix on 0.3.5.4-alpha.
2019-06-10 19:18:35 +10:00
Nick Mathewson
6a6f7eb671
Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0
2019-06-05 16:22:52 -04:00
Nick Mathewson
d63c17f2af
Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
2019-06-05 16:22:29 -04:00
Nick Mathewson
e51b57ee04
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
2019-06-05 16:16:34 -04:00
Nick Mathewson
2300a619a5
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0
2019-06-05 16:13:53 -04:00
Nick Mathewson
851e881f01
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
2019-06-05 16:12:07 -04:00
Nick Mathewson
a56d7e37aa
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0
2019-06-05 16:10:51 -04:00
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
Nick Mathewson
0982d01369
Start a changelog for 0.4.1.2-alpha
2019-06-05 09:24:18 -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
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
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
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
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
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
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
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
David Goulet
3789f22bcb
hs: Implement a helper to repurpose a circuit
...
When we repurpose a hidden service circuit, we need to clean up from the HS
circuit map and any HS related data structured contained in the circuit.
This commit adds an helper function that does it when repurposing a hidden
service circuit.
Fixes #29034
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-29 09:40:13 -04:00
Nick Mathewson
0e0cf4abd8
Tweak comments in tor_vasprintf(), and add a changes file for 30651
2019-05-29 09:38:57 -04:00
Nick Mathewson
bdf685e476
Changes file for bug 30614
2019-05-29 09:05:26 -04:00
David Goulet
ff9aa32143
Merge branch 'tor-github/pr/1047'
2019-05-28 14:59:07 -04:00
