George Kadianakis
eab9dc06af
Merge branch 'tor-github/pr/1065' into maint-0.4.1
2019-06-11 13:48:10 +03:00
Nick Mathewson
60213a3621
Run "make autostyle."
2019-06-05 09:33:35 -04:00
Nick Mathewson
fd8beab4dd
Merge branch 'bug29875_035' into bug29875_master
2019-05-31 12:40:43 -04:00
Nick Mathewson
5b3c886584
Consider dir info to have changed when the bridges change
...
Otherwise, we won't realize that we haven't got enough bridge
information to build circuits. Part of a fix for ticket 29875.
2019-05-31 12:27:42 -04:00
Nick Mathewson
70b85358af
Fix a logic error in deciding whether to accept SessionGroup=
...
Fixes bug 22619; bugfix on 0.2.7.2-alpha
2019-05-31 08:26:10 -04:00
Nick Mathewson
ba9b0319b0
Shutdown libevent _after_ the subsystems.
...
This is necessary since shutting down libevent frees some pointer
that the subsystems want to free themselves. A longer term solution
will be to turn the evloop module into a subsystem itself, but for
now it is best to do the minimal fix.
Fixes bug 30629; bugfix on 0.4.1.1-alpha.
2019-05-29 11:25:47 -04:00
George Kadianakis
69a277f635
Introduce circpad free_all() function.
2019-05-16 14:07:25 +03:00
George Kadianakis
338cfb3179
Merge branch 'tor-github/pr/1002'
2019-05-15 23:23:18 +03:00
Nick Mathewson
370ea8d23b
Merge branch 'ticket30452_035_v3' into ticket30452_041_v3
2019-05-14 19:55:51 -04:00
Nick Mathewson
0c451b31d2
Make --list-modules imply --hush
2019-05-14 19:55:35 -04:00
Nick Mathewson
1c95bdb83b
Merge branch 'ticket30452_035_v3' into ticket30452_041_v3
2019-05-14 19:20:53 -04:00
Nick Mathewson
1b16fcb70c
Add a --list-modules command
...
Closes ticket 30452.
2019-05-14 19:19:53 -04:00
Nick Mathewson
9ad2eb8f73
Merge branch 'bug28683_30173_29203_squashed'
2019-05-13 14:33:31 -04:00
Mike Perry
621ea2315b
Bug 29203: Provide ReducedCircuitPadding torrc and consensus params
2019-05-13 14:30:35 -04:00
Mike Perry
f4064d6ce2
Bug 28693: Provide Torrc option to disable circuit padding.
2019-05-13 14:30:35 -04:00
Nick Mathewson
3c2648bbda
Move "relay" and "router" periodic callbacks out of mainloop.c
...
(Some of these callbacks are specific to the OR module, so now it's
time to have an or_sys and or_periodic.)
2019-05-06 16:35:39 -04:00
Nick Mathewson
b394b5b2af
Create a relay subsystem and move the shutdown functions there
2019-05-06 16:25:09 -04:00
Nick Mathewson
9c3aa22740
Remove some now-needless dirauth includes
2019-05-02 09:22:13 -04:00
Nick Mathewson
a45413e7d5
Make keypin.c dirauth-only
2019-05-02 09:22:13 -04:00
Nick Mathewson
31fb4a7845
Make the bwauth.c module dirauth-only.
2019-05-02 09:22:13 -04:00
Nick Mathewson
339ac4dc67
Make the guardfraction.c module dirauth-only.
2019-04-30 15:00:08 -04:00
Nick Mathewson
857bfc7033
Make the process_descs.c module dirauth-only.
2019-04-30 15:00:07 -04:00
Nick Mathewson
b5a62b1ef5
Move dirauth periodic events into dirauth module.
...
Closes ticket 30294.
2019-04-30 11:14:59 -04:00
Nick Mathewson
6eb1b8da0a
Turn 'mainloop' into a subsystem.
...
We need a little refactoring for this to work, since the
initialization code for the periodic events assumes that libevent is
already initialized, which it can't be until it's configured.
This change, combined with the previous ones, lets other subsystems
declare their own periodic events, without mainloop.c having to know
about them. Implements ticket 30293.
2019-04-30 11:14:59 -04:00
teor
cb084de5e5
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5
2019-04-19 11:51:05 +10:00
George Kadianakis
574c207670
Merge branch 'maint-0.4.0'
2019-04-05 14:51:33 +03:00
Nick Mathewson
d194f6bedf
Implement an DormantCanceledByStartup option
...
Closes ticket 29357, and comes with appropriate notions of caution.
2019-04-04 11:48:36 -04:00
Nick Mathewson
a47b61f329
Merge branch 'messaging_v3' into messaging_v3_merged
2019-03-26 20:13:49 -04:00
Nick Mathewson
ab6ddc7a33
practracker: split shutdown code out of main.c
...
This is necessary to get the number of includes in main.c back under
control. (In the future, we could just use the subsystem manager for
this kind of stuff.)
2019-03-25 16:35:34 -04:00
Nick Mathewson
b4f28b9df8
pubsub: install libevent events separately from the_dispatcher.
...
Also, add documentation, and fix a free-on-error bug.
2019-03-25 16:35:34 -04:00
Nick Mathewson
6d1abd37e2
Connect the mainloop pubsub dispatcher on startup; free it on shutdown.
2019-03-25 16:35:33 -04:00
Nick Mathewson
bdeaf7d4b2
Code to manage publish/subscribe setup via subsystem interface.
...
This commit has the necessary logic to run the publish/subscribe
system from the mainloop, and to initialize it on startup and tear
it down later.
2019-03-25 16:35:33 -04:00
Nick Mathewson
2917ecaa97
Split command-handling and authentication from control.c
2019-03-25 14:06:56 -04:00
Nick Mathewson
a49f506e05
Split all controller events code into a new control_events.c
...
Also, split the formatting code shared by control.c and
control_events.c into controller_fmt.c.
2019-03-25 12:11:59 -04:00
David Goulet
13e93bdfd5
Merge branch 'tor-github/pr/718'
2019-03-01 09:36:23 -05:00
Nick Mathewson
732855c2e5
Merge branch 'maint-0.4.0'
2019-02-26 07:27:50 -05:00
Nick Mathewson
35257a1c69
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0
2019-02-26 07:27:42 -05:00
Nick Mathewson
b3416476b4
Remove all uses of weak_rng.
...
I'm not removing the weak_rng code itself yet, since it is possible
that we will want to revert one of these.
2019-02-20 12:24:34 -05:00
David Goulet
8f5a3c0460
Merge branch 'tor-github/pr/675'
2019-02-20 11:45:58 -05:00
juga0
fc3e90a7b6
bwauth: Add function to get the digest of a bw file
2019-02-13 12:26:00 +00:00
Nick Mathewson
7f59b9fb1f
Merge branch 'maint-0.3.5'
2019-02-08 08:37:46 -05:00
Nick Mathewson
ab65347819
Merge branch 'ticket29040_1_changes' into maint-0.3.5
2019-02-08 08:37:43 -05:00
José M. Guisado
cb1072790f
Warn about missing ContactInfo when MyFamily set
...
Operators should be warned when setting MyFamily in
addition to missing ContactInfo
Signed-off-by: José M. Guisado <guigom@riseup.net>
2019-01-31 13:27:42 +01:00
Suphanat Chunhapanya
238a9080c6
hs-v3: add an option param to safe log functions
...
We add an option param to safe_str and safe_str_client because in
some case we need to use those functions before global_options is set.
2019-01-24 04:31:18 +07:00
Nick Mathewson
2f683465d4
Bump copyright date to 2019
2019-01-16 12:33:22 -05:00
Nick Mathewson
efe55b8898
Bump copyright date to 2019.
2019-01-16 12:32:32 -05:00
Nick Mathewson
b169c8c14f
Merge remote-tracking branch 'asn-github/adaptive_padding-final'
2019-01-14 14:48:00 -05:00
Nick Mathewson
e6a4401200
Merge branch 'maint-0.3.5'
2019-01-09 08:52:10 -05:00
Kris Katterjohn
c13a81f7f9
Fix (and make consistent) the use of OpenBSD preprocessor macro tests
...
Prior to this commit, the testsuite was failing on OpenBSD. After
this commit the testsuite runs fine on OpenBSD.
It was previously decided to test for the OpenBSD macro (rather than
__OpenBSD__, etc.) because OpenBSD forks seem to have the former
macro defined. sys/param.h must be included for the OpenBSD macro
definition; however, many files tested for the OpenBSD macro without
having this header included.
This commit includes sys/param.h in the files where the OpenBSD macro
is used (and sys/param.h is not already included), and it also
changes some instances of the __OpenBSD__ macro to OpenBSD.
See commit 27df23abb6
which changed
everything to use OpenBSD instead of __OpenBSD__ or OPENBSD. See
also tickets #6982 and #20980 (the latter ticket is where it was
decided to use the OpenBSD macro).
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-09 08:51:57 -05:00
Mike Perry
8ad497bb57
Config option to specify specific MiddleNodes.
...
Hope is this will make it easier to test on the live tor network.
Does not need to be merged if we don't want to, but will come in handy
for researchers.
Co-authored-by: George Kadianakis <desnacked@riseup.net>
2019-01-02 15:25:55 +02:00