Nick Mathewson
10a1969ca3
Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
2018-04-10 14:25:57 -04:00
Nick Mathewson
16f08de0fd
Remove TestingEnableTbEmptyEvent
...
This option was used for shadow testing previously, but is no longer
used for anything. It interferes with refactoring our token buckets.
2018-04-10 12:16:21 -04:00
Isis Lovecruft
3ee7a8d3a5
tests: Make tt_finished() macro for tests without tt_*_op() calls.
2018-04-09 19:32:47 +00:00
Isis Lovecruft
c2c5b13e5d
test: Add testing module and some unittests for bridges.c.
...
This roughly doubles our test coverage of the bridges.c module.
* ADD new testing module, .../src/test/test_bridges.c.
* CHANGE a few function declarations from `static` to `STATIC`.
* CHANGE one function in transports.c, transport_get_by_name(), to be
mockable.
* CLOSES #25425 : https://bugs.torproject.org/25425
2018-04-09 19:32:46 +00:00
Nick Mathewson
e0809ec5f5
Prefer 32-bit implementation for timing wheels on 32-bit systems.
...
This might make our timing-wheel code a tiny bit faster there.
Closes ticket 24688.
2018-04-09 15:21:10 -04:00
David Goulet
395fa0258d
compat: Fix unchecked return value from event_del()
...
Explicitly tell the compiler we don't care about it.
Coverity CID 1434156
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-09 14:12:45 -04:00
Nick Mathewson
e58555135a
Add a comment explaining why we do a certain redundant check
...
Closes ticket 25291.
2018-04-09 12:58:17 -04:00
Alexander Færøy
1295044dc8
Lift the list of default directory servers into their own file.
...
This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.
Patch by beastr0.
See: https://bugs.torproject.org/24854
2018-04-09 16:00:26 +02:00
Nick Mathewson
2fac948158
Include tor_log rust files in source distribution.
...
Fixes another case of #25732 ; bug not in any released Tor.
2018-04-06 16:19:14 -04:00
Nick Mathewson
fb2fe41f6f
Merge branch 'maint-0.3.3'
2018-04-06 16:18:47 -04:00
Nick Mathewson
306563ac68
Ship all files needed to build Tor with rust
...
Fixes bug 25732; bugfix on 0.3.3.2-alpha when strings.rs was
introduced.
2018-04-06 16:18:11 -04:00
Nick Mathewson
98b694bfd5
Merge branch 'isolate_libevent_2_squashed'
2018-04-06 08:50:35 -04:00
Roger Dingledine
0b0e4886cf
fix confusing comment
...
presumably introduced by copy-and-paste mistake
2018-04-05 15:59:37 -04:00
Nick Mathewson
421c2310a8
changes file for libevent isolation work
2018-04-05 12:36:28 -04:00
Nick Mathewson
245fdf8ca0
Remove needless event2/thread.h include from test_compat_libevent.c
2018-04-05 12:36:28 -04:00
Nick Mathewson
4225300648
Remove redundant event2/event.h usage from test_scheduler.c
...
This module doesn't actually need to mock the libevent mainloop at
all: it can just use the regular mainloop that the test environment
sets up.
Part of ticket 23750.
2018-04-05 12:36:28 -04:00
Nick Mathewson
6a5f62f68f
Move responsibility for threadpool reply-handler events to workqueue
...
This change makes cpuworker and test_workqueue no longer need to
include event2/event.h. Now workqueue.c needs to include it, but
that is at least somewhat logical here.
2018-04-05 12:36:28 -04:00
Nick Mathewson
b3586629c9
Wrap the function we use to run the event loop.
...
Doing this lets us remove the event2/event.h header from a few more
modules, particularly in the tests.
Part of work on 23750.
2018-04-05 12:36:27 -04:00
Nick Mathewson
39cb04335f
Add wrappers for event_base_loopexit and event_base_loopbreak.
2018-04-05 12:36:05 -04:00
Nick Mathewson
f0d2733b46
Revise procmon.c to use periodic_timer_t
...
This removes its need to use event2/event.h, and thereby fixes
another instance of 23750.
2018-04-05 12:35:11 -04:00
Nick Mathewson
871ff0006d
Add an API for a scheduled/manually activated event in the mainloop
...
Using this API lets us remove event2/event.h usage from half a dozen
modules, to better isolate libevent. Implements part of ticket
23750.
2018-04-05 12:35:11 -04:00
Nick Mathewson
c6d7e0becf
Merge remote-tracking branch 'public/split_relay_crypto'
2018-04-05 12:12:18 -04:00
Nick Mathewson
12fc4206f2
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 12:09:00 -04:00
Nick Mathewson
2933f73b31
Merge branch 'maint-0.3.3'
2018-04-05 12:09:00 -04:00
Nick Mathewson
124e06e85c
Merge branch 'ticket25296_032_squashed' into maint-0.3.2
2018-04-05 12:08:53 -04:00
Nick Mathewson
c2d93e8a7d
PerConnBW{Rate,Burst} docs: do not say consensus param is always set
...
Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
2018-04-05 12:08:35 -04:00
David Goulet
6bd8f648b7
man: Move RephistTrackTime to the server section
...
Every node in the network uses that value, it is a general server options, not
a dirauth specific one.
Fixes #25720
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-05 09:42:45 -04:00
Neel Chauhan
f5f9c25546
Switch to use should_record_bridge_info()
...
Both in geoip_note_client_seen() and options_need_geoip_info(), switch from
accessing the options directly to using the should_record_bridge_info() helper
function.
Fixes #25290
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-05 08:37:39 -04:00
Nick Mathewson
2dee38fba0
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 08:36:13 -04:00
Nick Mathewson
df519e5de8
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-05 08:36:13 -04:00
Nick Mathewson
98157c72cd
Merge branch 'maint-0.3.3'
2018-04-05 08:36:13 -04:00
Taylor Yu
e813116d3d
Switch Travis to stable rust
2018-04-05 08:36:09 -04:00
Nick Mathewson
ad8347418f
Merge branch 'maint-0.3.3'
2018-04-05 08:22:35 -04:00
Nick Mathewson
78bf564168
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 08:22:34 -04:00
Nick Mathewson
9b10eb2d7a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-05 08:22:34 -04:00
Nick Mathewson
834eef2452
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-05 08:22:34 -04:00
Nick Mathewson
b68e636b33
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-04-05 08:22:33 -04:00
Nick Mathewson
43f3155582
Merge branch 'maint-0.3.3'
2018-04-05 08:21:43 -04:00
Nick Mathewson
ac3e389dbd
Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3
2018-04-05 08:21:38 -04:00
Nick Mathewson
8f798b686d
Merge branch 'bug25679_033_squashed' into maint-0.3.3
2018-04-05 08:20:15 -04:00
Nick Mathewson
e3ad4957a8
Fix the default for TOR_RUST_DEPENDENCIES
...
By default, we want to look at the crates directory of the
submodule, not the toplevel of the submodule. Fixes bug 25679;
bugfix on 0.3.3.1-alpha.
2018-04-05 08:20:07 -04:00
Karsten Loesing
1fa396b0a4
Update geoip and geoip6 to the April 3 2018 database.
2018-04-05 10:42:25 +02:00
David Goulet
ff38c0589c
man: Add a comment to anchor only option
...
Some anchor don't appear in the final man page so document those so we
understand why we do that in the future.
Part of #25582
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-04 11:38:42 -04:00
David Goulet
3d5bf12ac2
relay: Remove max middle cells dead code
...
Next commit is addressing the circuit queue cell limit so cleanup before doing
anything else.
Part of #25226
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-04 11:03:50 -04:00
Nick Mathewson
52846f728d
Merge branch 'maint-0.3.3'
2018-04-04 08:57:24 -04:00
Nick Mathewson
ec8ee54129
Merge branch 'bug21394_029_redux' into maint-0.3.3
2018-04-04 08:55:37 -04:00
Dhalgren
06484eb5e1
Bug 21394 touchup: Increase DNS attempts to 3
...
Also don't give up on a resolver as quickly if multiple are configured.
2018-04-04 08:54:25 -04:00
Neel Chauhan
9df110cd72
Remove PortForwarding options
...
Signed-off-by: Isis Lovecruft <isis@torproject.org>
2018-04-04 00:19:33 +00:00
Nick Mathewson
218b1746ba
Merge remote-tracking branch 'fristonio/ticket-25645'
2018-04-03 19:19:02 -04:00
Nick Mathewson
21c81348a3
Fix bug24031 changes file
2018-04-03 19:03:33 -04:00