35dd2d733b
Merge branch 'maint-0.4.1'
2019-06-11 11:30:05 -04:00
ea14fb136c
Merge branch 'tor-github/pr/1050' into maint-0.4.1
2019-06-11 11:29:46 -04:00
5068ccab0b
Add a changes file for ticket 30686.
2019-06-11 11:29:23 -04:00
3405a311da
Merge branch 'maint-0.4.1'
2019-06-11 10:17:18 -04:00
ce89fe36c8
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-11 10:17:18 -04:00
afa2c39baa
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-06-11 10:17:18 -04:00
b0fa1f4fb0
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-06-11 10:17:17 -04:00
0ec4ebd00d
Update geoip and geoip6 to the June 10 2019 database.
2019-06-11 16:12:50 +02:00
eb02c323eb
Merge branch 'maint-0.4.1'
2019-06-11 08:41:55 -04:00
29842f68e7
Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1
2019-06-11 08:41:48 -04:00
a7986755ee
Merge branch 'tor-github/pr/1060'
2019-06-11 14:12:22 +03:00
e5ad6fb092
Merge branch 'ticket30769_041_01'
2019-06-11 14:11:24 +03:00
c1359b32a4
trunnel: Rename sendme.trunnel to sendme_cell.trunnel
...
This is to avoid having two sendme.{c|h} in the repository since the subsystem
is implemented in src/core/or/sendme.{c|h}.
Fixes #30769
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-06-11 14:11:10 +03:00
646f7a9a94
Merge branch 'ticket30687_042_01'
2019-06-11 14:02:33 +03:00
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
b83dba7cb0
Merge branch 'maint-0.4.1'
2019-06-11 13:48:16 +03:00
eab9dc06af
Merge branch 'tor-github/pr/1065' into maint-0.4.1
2019-06-11 13:48:10 +03:00
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
2019-06-11 14:51:46 +10:00
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
2019-06-11 14:51:37 +10:00
202ccc3930
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
2019-06-11 14:48:52 +10:00
a58c4cc6dd
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
2019-06-11 14:47:40 +10:00
cb20054ccd
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
2019-06-11 14:46:24 +10:00
cfa943f140
Merge branch 'maint-0.4.1'
2019-06-10 18:44:31 -04:00
5b07ff4011
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:44:31 -04:00
c8447f95ec
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
2019-06-10 18:44:20 -04:00
d6b411a351
Merge branch 'maint-0.4.1'
2019-06-10 18:33:26 -04:00
6a72cc2598
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:33:26 -04:00
df8e2bbc0f
Merge remote-tracking branch 'tor-github/pr/1038'
2019-06-10 09:38:40 -04:00
765e4364d9
Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
2019-06-10 09:37:17 -04:00
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
2019-06-10 20:50:53 +10:00
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
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
c7fc53c2e7
Merge branch 'bug30781_040' into bug30781_master
2019-06-06 09:57:31 +10:00
fb3f461406
Merge branch 'bug30781_035' into bug30781_040
2019-06-06 09:56:50 +10:00
c8c2e2b8fc
Merge branch 'bug30781_034' into bug30781_035
...
Moved fix from src/or/routerparse.c to src/feature/dirparse/routerparse.c.
2019-06-06 09:55:44 +10:00
dc8e3cd5ce
Merge branch 'bug30781_029' into bug30781_034
2019-06-06 09:53:02 +10:00
ba83c1e5cf
dirparse: Stop crashing when parsing unknown descriptor purpose annotations
...
We think this bug can only be triggered by modifying a local file.
Fixes bug 30781; bugfix on 0.2.0.8-alpha.
2019-06-06 09:51:24 +10: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
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
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
0982d01369
Start a changelog for 0.4.1.2-alpha
2019-06-05 09:24:18 -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
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
David Goulet
Nick Mathewson
Karsten Loesing
George Kadianakis
teor
Mike Perry