Nick Mathewson
a052eea480
Merge branch 'maint-0.3.3'
2018-04-25 08:01:54 -04:00
Nick Mathewson
7c3f87eb4b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-25 08:01:53 -04:00
Nick Mathewson
bb35405d2a
Fix a copy-paste error in the fix for #23693 .
...
Found by coverity; CID 25912; bug not in any released Tor.
2018-04-25 08:00:55 -04:00
Nick Mathewson
85cd8386fa
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 10:38:37 -04:00
Nick Mathewson
8664f76dd2
Merge branch 'maint-0.3.3'
2018-04-24 10:38:37 -04:00
Nick Mathewson
89a3fafd49
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 10:38:37 -04:00
Nick Mathewson
5cc3a0379e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-24 10:38:37 -04:00
Nick Mathewson
d44753b0e8
Merge branch 'travis_distcheck_033' into maint-0.3.3
2018-04-24 10:38:34 -04:00
Nick Mathewson
34e7dca9c9
Merge branch 'travis_distcheck_029' into maint-0.2.9
2018-04-24 10:38:19 -04:00
Nick Mathewson
ea3c3a10a2
Merge branch 'maint-0.3.3'
2018-04-24 10:37:36 -04:00
Nick Mathewson
7e7b052b2a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 10:37:36 -04:00
Nick Mathewson
9187cdb1cd
Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
2018-04-24 10:36:17 -04:00
Nick Mathewson
9be7608fda
Merge branch 'maint-0.3.3'
2018-04-24 08:51:58 -04:00
Nick Mathewson
6182f60f75
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 08:51:55 -04:00
Nick Mathewson
d2951b381b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 08:49:24 -04:00
Nick Mathewson
e888634076
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
2018-04-24 08:49:20 -04:00
David Goulet
b259008c56
hs: Fix memleak in v3 on SIGHUP
...
Fixes #25901
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 11:09:57 -04:00
Nick Mathewson
192c7c8bf9
Merge remote-tracking branch 'dgoulet/ticket25762_034_05'
2018-04-23 11:02:05 -04:00
David Goulet
665e23c59a
test: Add periodic events unit tests
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 10:57:28 -04:00
David Goulet
87cb9ce900
main: Update periodic events comment based on latest code
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 10:57:28 -04:00
Nick Mathewson
f70fa67da6
main: Use rescan_periodic_events in initialize_periodic_events_cb
2018-04-23 10:57:28 -04:00
David Goulet
4e85f17eec
periodic: Add an enable and disable function
...
Two helper functions to enable an event and disable an event which wraps the
launch and destroy of an event but takes care of the enabled flag.
They are also idempotent that is can be called multiple time on the same event
without effect if the event was already enabled or disabled.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 10:57:28 -04:00
David Goulet
1d864987cb
config: Set up periodic events when options changes
...
In case we transitionned to a new role in Tor, we need to launch and/or
destroy some periodic events.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 10:57:28 -04:00
David Goulet
a4fcdc5dec
main: Launch periodic events by roles
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 10:57:28 -04:00
David Goulet
ed89bb3253
main: Specialize the periodic events on a per-role basis
...
In tor, we have a series of possible "roles" that the tor daemon can be
enabled for. They are:
Client, Bridge, Relay, Authority (directory or bridge) and Onion service.
They can be combined sometimes. For instance, a Directory Authority is also a
Relay. This adds a "roles" field to a periodic event item object which is used
to know for which roles the event is for.
The next step is to enable the event only if the roles apply. No behavior
change at this commit.
Pars of #25762
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 10:21:59 -04:00
David Goulet
269cd5dba7
main: Sort alphabetically periodic event callbacks
...
No behavior change, just to make it easier to find callbacks and for the sake
of our human brain to parse the list properly.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 10:21:59 -04:00
Nick Mathewson
3527f4b8a4
Merge remote-tracking branch 'github/lazy_bucket_refill'
2018-04-23 09:47:05 -04:00
Nick Mathewson
e8683bcbb1
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-23 09:24:33 -04:00
Nick Mathewson
1b40e9986b
Merge branch 'maint-0.3.3'
2018-04-23 09:24:33 -04:00
Nick Mathewson
1438c6c713
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-23 09:23:31 -04:00
Nick Mathewson
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
Nick Mathewson
c5ffcbb43f
Merge branch 'maint-0.3.3'
2018-04-23 09:23:31 -04:00
Nick Mathewson
beb321d8cd
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-23 09:23:31 -04:00
Nick Mathewson
9727b4c5d6
Merge branch 'bug24969_029_v2' into maint-0.2.9
2018-04-23 09:23:25 -04:00
Nick Mathewson
c4be6dfeab
Permit the nanosleep system call in the seccomp2 callbox
...
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2018-04-23 09:15:40 -04:00
Nick Mathewson
cd3fc2aa48
Merge remote-tracking branch 'neel/b25511-r4'
2018-04-23 09:13:24 -04:00
Nick Mathewson
8c01aee2e3
Document default for ControlSocket.
...
Closes 25897.
2018-04-23 07:47:50 -04:00
Nick Mathewson
915791bc48
Merge branch 'ticket25024_squashed'
2018-04-22 20:53:04 -04:00
Nick Mathewson
fa21ac1de6
Tweak changes file for 25024 to mention "check-typos"
2018-04-22 20:52:55 -04:00
Deepesh Pathak
72bfcb37f1
add changes file and update check-typos in makefile
2018-04-22 20:48:48 -04:00
Deepesh Pathak
48092540d0
Add spell check to makefile to check for typos ticket#25024
...
- Use misspell to check for typos in codebase
- Add `make check-typos` to run the checks
- Add `check-typos` to `make check`
2018-04-22 20:48:44 -04:00
Nick Mathewson
1ba9b7e013
Merge remote-tracking branch 'mikeperry/bug25400_squashed'
2018-04-22 20:39:35 -04:00
Nick Mathewson
0e8ae82a87
Merge branch 'remove_old_consensus_methods_2018_squashed'
2018-04-22 20:01:09 -04:00
Nick Mathewson
ade3c74007
Add a changes file for removing old consensus methods
...
(Ticket 24378; proposal 290.)
2018-04-22 20:00:47 -04:00
Nick Mathewson
2609a8be81
Require MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS
...
(Remove support for running without this method.)
2018-04-22 20:00:47 -04:00
Nick Mathewson
5f90d28c01
Remove MIN_METHOD_FOR_{SHARED_RANDOM,EXCLUDING_INVALID_NODES}
...
Also remove client detection for pre-EXCLUDING_INVALID_NODES
consensuses, and a test for that detection.
2018-04-22 20:00:47 -04:00
Nick Mathewson
73c9c16faa
Remove MIN_METHOD_FOR_ED25519_ID_VOTING
...
This also lets us remove the old rsa-based routerstatus collator.
2018-04-22 20:00:47 -04:00
Nick Mathewson
4d6f21bb6b
Remove MIN_METHOD_FOR_{PACKAGE_LINES,GUARDFRACTION,ED25519_ID_IN_MD}
...
Also remove a rest for pre-19 microdesc versions.
2018-04-22 20:00:47 -04:00
Nick Mathewson
caf766991d
Remove MIN_METHOD_FOR_ID_HASH_IN_MD and a test for running without it.
2018-04-22 20:00:47 -04:00
Nick Mathewson
93380db833
Remove MIN_METHOD_{FOR_P6_LINES,FOR_NTOR_KEY,TO_CLIP_UNMEASURED_BW}
...
Also remove a unit test for pre-MIN_METHOD_FOR_NTOR_KEY consensuses.
2018-04-22 20:00:47 -04:00