7c6cc470f1
Merge branch 'bug30894_035' into ticket30893
2019-06-15 16:50:02 -04:00
26436fb1b6
Add more unit tests for confparse.c, so we can refactor.
...
This set of tests gets the line coverage to 100%.
2019-06-15 16:49:18 -04:00
4ab1d1c0c4
Fix memleak when failing to parse a CSV_INTERVAL.
...
Fixes bug 30894; bugfix on 0.3.4.1-alpha
2019-06-15 16:47:16 -04:00
fe9d15cf4b
Remove the PORT configuration type: nothing uses it.
...
All of our port configurations now use an extended format.
2019-06-15 11:30:24 -04:00
ac5e44d9ce
Renaming: CONFIG_TYPE_UINT -> CONFIG_TYPE_POSINT
...
This name has been a historical source of confusion, since "uint"
usually suggests "unsigned int" to people, when the real type is
"nonnegative int".
2019-06-15 11:28:19 -04:00
96fade0a7d
Merge branch 'tor-github/pr/1088'
2019-06-12 13:01:53 +03:00
f7e8b3b68c
Merge branch 'tor-github/pr/1040'
2019-06-11 11:59:39 -04:00
0bce0c339d
Rework origin circuit tracking to use pubsub
...
Part of ticket 29976.
2019-06-11 11:59:30 -04:00
a8c0f4ddfe
Rework orconn tracking to use pubsub
...
Part of ticket 29976.
2019-06-11 11:59:30 -04:00
8e112cecd8
Merge branch 'tor-github/pr/1031'
2019-06-11 11:46:38 -04:00
e9d99d2e15
Merge branch 'tor-github/pr/1083'
2019-06-11 11:43:15 -04:00
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
cad0de35bd
Give a compile warning when we don't have any flags for minherit().
...
Part of ticket 30686.
2019-06-11 11:29:23 -04:00
93ddc51cbd
Give a more useful failure messgae when we fail to minherit().
...
Part of 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
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
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
2019-06-11 14:51:37 +10:00
cb20054ccd
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
2019-06-11 14:46:24 +10: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
c8e09dd0d2
Merge branch 'maint-0.4.1'
2019-06-10 18:31:36 -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
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
c46e99c43c
Tolerate net-unreachable failures in util/socketpair_ersatz
...
This can happen when we have no network stack configured. Fixes bug
30804; bugfix on 0.2.5.1-alpha.
2019-06-07 13:52:03 -04:00
ecc5feff38
bump to 0.4.1.2-alpha-dev
2019-06-06 08:28:34 -04:00
19bf5806ad
dirauth: Return a distinct status when formatting annotations fails
...
Adds ROUTER_AUTHDIR_BUG_ANNOTATIONS to was_router_added_t.
The out-of-order numbering is deliberate: it will be fixed by later commits
for 16564.
Fixes bug 30780; bugfix on 0.2.0.8-alpha.
2019-06-06 17:26:23 +10:00
a4ea335a69
dirauth: Fix some comments in the router status processing code.
...
Fixes comments in dirserv_router_get_status() and was_router_added_t.
Preparation for 30780 and 16564.
2019-06-06 17:26:23 +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
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
Nick Mathewson
George Kadianakis
David Goulet
Taylor Yu
Karsten Loesing
teor