teor
e9f1e975df
Merge branch 'maint-0.4.1'
2019-06-11 14:52:40 +10:00
teor
2779ce1f6f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-11 14:52:36 +10:00
teor
4ca18fde93
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-06-11 14:52:27 +10:00
teor
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
2019-06-11 14:51:46 +10:00
teor
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
2019-06-11 14:51:37 +10:00
teor
202ccc3930
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
2019-06-11 14:48:52 +10:00
teor
a58c4cc6dd
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
2019-06-11 14:47:40 +10:00
teor
cb20054ccd
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
2019-06-11 14:46:24 +10: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
c8e09dd0d2
Merge branch 'maint-0.4.1'
2019-06-10 18:31:36 -04:00
Nick Mathewson
c0285320df
Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1
2019-06-10 18:31:23 -04:00
Nick Mathewson
df8e2bbc0f
Merge remote-tracking branch 'tor-github/pr/1038'
2019-06-10 09:38:40 -04:00
Nick Mathewson
1190636f24
Merge branch 'maint-0.4.1'
2019-06-10 09:37:28 -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
Nick Mathewson
adc7b50eae
Bump master to 0.4.2.0-alpha-dev
2019-06-10 08:47:33 -04:00
teor
b9041e8a63
test: fix a typo in test_rebind.sh
...
Closes 30821.
2019-06-10 20:56:40 +10: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
ecc5feff38
bump to 0.4.1.2-alpha-dev
2019-06-06 08:28:34 -04:00
Nick Mathewson
3c2b2f072f
Merge branch 'maint-0.4.0'
2019-06-05 16:24:10 -04: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
04cb2d4010
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0
2019-06-05 16:14:51 -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
Nick Mathewson
30f0e993c9
push release date to tomorrow: too many last minute surprises
2019-06-05 15:53:52 -04:00
Nick Mathewson
4ceec4760c
change some CI-substitute logic
2019-06-05 15:38:25 -04:00
Nick Mathewson
54eb3c043c
Merge remote-tracking branch 'tor-github/pr/1076'
2019-06-05 15:35:43 -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
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
