c8e09dd0d2
Merge branch 'maint-0.4.1'
2019-06-10 18:31:36 -04:00
c0285320df
Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1
2019-06-10 18:31:23 -04:00
df8e2bbc0f
Merge remote-tracking branch 'tor-github/pr/1038'
2019-06-10 09:38:40 -04:00
1190636f24
Merge branch 'maint-0.4.1'
2019-06-10 09:37:28 -04:00
765e4364d9
Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
2019-06-10 09:37:17 -04:00
adc7b50eae
Bump master to 0.4.2.0-alpha-dev
2019-06-10 08:47:33 -04:00
b9041e8a63
test: fix a typo in test_rebind.sh
...
Closes 30821.
2019-06-10 20:56:40 +10:00
ecc5feff38
bump to 0.4.1.2-alpha-dev
2019-06-06 08:28:34 -04:00
3c2b2f072f
Merge branch 'maint-0.4.0'
2019-06-05 16:24:10 -04:00
6a6f7eb671
Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0
2019-06-05 16:22:52 -04:00
d63c17f2af
Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
2019-06-05 16:22:29 -04:00
e51b57ee04
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
2019-06-05 16:16:34 -04:00
04cb2d4010
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0
2019-06-05 16:14:51 -04:00
2300a619a5
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0
2019-06-05 16:13:53 -04:00
851e881f01
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
2019-06-05 16:12:07 -04:00
a56d7e37aa
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0
2019-06-05 16:10:51 -04:00
30f0e993c9
push release date to tomorrow: too many last minute surprises
2019-06-05 15:53:52 -04:00
4ceec4760c
change some CI-substitute logic
2019-06-05 15:38:25 -04:00
54eb3c043c
Merge remote-tracking branch 'tor-github/pr/1076'
2019-06-05 15:35:43 -04:00
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
31c34f6524
Revert "hs: Implement a helper to repurpose a circuit"
...
This reverts commit 3789f22bcb
2019-06-05 11:38:01 -07:00
a42131bf48
Revert "test: Add test_hs_circ.c for HS circuit testing"
...
This reverts commit 41b94722e5
2019-06-05 11:37:32 -07:00
27e067df4f
Add missing newline after decode_intro_points() closing bracket
2019-06-05 12:50:01 -04:00
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
7f341d6482
minor changelog edits
2019-06-05 09:43:43 -04:00
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
2926f49b24
Regenerate practracker excpetions file
2019-06-05 09:34:14 -04:00
60213a3621
Run "make autostyle."
2019-06-05 09:33:35 -04:00
d1b02456c1
Bump to 0.4.1.2-alpha
2019-06-05 09:25:21 -04:00
d2de899bf4
Rewrap the changelog
2019-06-05 09:24:42 -04:00
0982d01369
Start a changelog for 0.4.1.2-alpha
2019-06-05 09:24:18 -04:00
ae490189f8
practracker update
2019-06-05 09:06:43 -04:00
b39a8d315d
Merge remote-tracking branch 'tor-github/pr/1053'
2019-06-05 09:04:09 -04:00
0c16ec4c07
Merge branch 'bug30286_2_squashed'
2019-06-05 08:32:39 -04:00
e8aab46a3a
Document TOR_UPSTREAM_REMOTE_NAME env variable
2019-06-05 08:29:55 -04:00
8cb6b2b9ab
Fix typo in #29670 changes file.
2019-06-05 14:56:28 +03:00
99bf3d8e14
Merge branch 'tor-github/pr/1072'
2019-06-05 14:40:38 +03:00
a63c5f844b
Merge branch 'tor-github/pr/1067'
2019-06-04 09:57:03 -04:00
dc5cdde60c
update practracker
2019-06-04 08:29:43 -04:00
4022b6d6b7
Merge branch 'bug29670_035' into bug29670_041
2019-06-04 08:29:05 -04:00
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
180048e013
fix some simple typos
2019-06-01 15:37:51 -04:00
5e594831c7
Practracker excpetions.
2019-05-31 12:41:44 -04:00
fd8beab4dd
Merge branch 'bug29875_035' into bug29875_master
2019-05-31 12:40:43 -04:00
c09e7a4e71
changes file for bug 29875.
2019-05-31 12:39:52 -04:00
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
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
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
5d4b4f948a
Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md
2019-05-31 09:35:19 +03:00
dd62cb788e
Merge branch 'tor-github/pr/1059'
2019-05-30 21:01:59 +03:00
Nick Mathewson
teor
Mike Perry
Neel Chauhan
George Kadianakis
rl1987
David Goulet
Roger Dingledine