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
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
b5a62b1ef5
Move dirauth periodic events into dirauth module.
...
Closes ticket 30294.
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
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
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
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
Nick Mathewson
0af0f78dff
Merge branch 'maint-0.3.5'
2018-12-18 13:52:39 -05:00
Nick Mathewson
4894d44ab8
Always initialize addr in parse_port_config()
...
It was always analyzed before use, but scan-build wasn't able to
persuade itself of that.
Closes ticket 28881.
2018-12-18 13:52:25 -05:00
Nick Mathewson
a3e6f2467b
Merge remote-tracking branch 'tor-github/pr/595'
2018-12-18 13:51:21 -05:00
Nick Mathewson
e969d9c6b4
Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged
2018-12-17 16:41:01 -05:00
Alexander Færøy
ccc1963890
Move remaining code from subprocess.{h,c} to more appropriate places.
...
This patch moves the remaining code from subprocess.{h,c} to more
appropriate places in the process.c and process_win32.c module.
We also delete the now empty subprocess module files.
See: https://bugs.torproject.org/28179
2018-12-17 16:39:28 -05:00
Rob Jansen
325348b360
allow any value for HearbeatPeriod in testing Tor networks
2018-12-14 09:22:23 -05:00
Nick Mathewson
69264f96f3
Merge branch 'dormant_persist_squashed'
2018-12-13 08:26:10 -05:00
Nick Mathewson
e1273d7d1b
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 09:41:05 -05:00
Nick Mathewson
27e4269929
Merge branch 'maint-0.3.5'
2018-12-11 09:41:05 -05:00
Nick Mathewson
4f55884315
Add an option to start tor in dormant mode for the first time.
2018-12-04 12:08:24 -05:00
Nick Mathewson
b25b8150c2
Remember in our state file how long we've spent since user activity
...
Rather than initializing the "Dormant" status to "off" and the "last
activity" count to "now", initialize them based on our state file:
stay dormant if we were dormant, or remember the amount of time
we've spent inactive.
2018-12-04 11:59:11 -05:00
Nick Mathewson
2b2b97484a
Merge branch 'ticket27490a_squashed'
2018-12-01 20:32:18 -05:00
Neel Chauhan
822cb93cab
Add new option ClientAutoIPv6ORPort to switch between IPv4 and IPv6 OR ports
2018-12-01 14:55:57 -05:00
Nick Mathewson
701eaef980
Move net.inet.ip.random_id code to lib/net/
2018-12-01 11:36:03 -05:00
Nick Mathewson
d4d4a4b2dd
Merge remote-tracking branch 'tor-github/pr/527'
2018-12-01 11:30:53 -05:00
Nick Mathewson
3743f79695
Add options to control dormant-client feature.
...
The DormantClientTimeout option controls how long Tor will wait before
going dormant. It also provides a way to disable the feature by setting
DormantClientTimeout to e.g. "50 years".
The DormantTimeoutDisabledByIdleStreams option controls whether open but
inactive streams count as "client activity". To implement it, I had to
make it so that reading or writing on a client stream *always* counts as
activity.
Closes ticket 28429.
2018-11-26 16:32:40 -05:00
Fabian Keil
71651ea4aa
Complain if net.inet.ip.random_id is not set on FreeBSD-based servers
...
Apparently a couple of operators haven't gotten the memos [0] yet
and it looks like FreeBSD's default value will not change any time
soon [1].
[0]:
https://lists.torproject.org/pipermail/tor-relays/2014-March/004199.html
https://lists.torproject.org/pipermail/tor-relays/2014-November/005687.html
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195828
[1]:
https://lists.freebsd.org/pipermail/freebsd-net/2015-April/041942.html
2018-11-19 16:28:00 +01:00
Nick Mathewson
4bf79fa4fa
Turn second_elapsed_callback into a normal periodic event.
2018-11-15 11:17:22 -05:00
Nick Mathewson
bf4f55a13d
Merge branch 'subsystems'
2018-11-09 15:01:49 -05:00
Nick Mathewson
8a5590ebac
Merge remote-tracking branch 'tor-github/pr/484' into maint-0.3.5
2018-11-06 15:19:04 -05:00
Nick Mathewson
cad61f0f6d
Move prefork, postfork, and thread-exit hooks into subsys
...
So far, crypto is the only module that uses them, but others are
likely to do so in the future.
2018-11-05 09:22:02 -05:00
Nick Mathewson
6e7ff8cba0
Move the code that knows our tor version into a lowest-level lib
2018-11-05 09:22:02 -05:00
Nick Mathewson
43211c3a0c
Merge remote-tracking branch 'public/bug27893'
2018-10-01 12:12:33 -05:00