Nick Mathewson
4754e9058b
Split getinfo handling into a new control_getinfo.c
2019-03-25 12:49:24 -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
teor
d4d541c53c
Merge remote-tracking branch 'tor-github/pr/785'
2019-03-25 14:01:20 +10:00
Nick Mathewson
9d0ce0afcc
forward-port changelog for 0.4.0.3-alpha
2019-03-23 08:46:29 -04:00
Nick Mathewson
91c24ad530
Merge branch 'maint-0.4.0'
...
"ours" to avoid version bump
2019-03-23 08:44:44 -04:00
Nick Mathewson
8bc3ac6a84
Bump to 0.4.0.3-alpha-dev
2019-03-23 08:44:36 -04:00
Nick Mathewson
22e72eeaa7
Merge branch 'maint-0.4.0'
2019-03-22 11:17:10 -04:00
Nick Mathewson
4b79b43e3e
Merge branch 'bug29693_040_radical_squashed' into maint-0.4.0
2019-03-22 11:17:01 -04:00
George Kadianakis
a5df9402b6
prob-distr: Decrease false positive rate of stochastic tests.
2019-03-22 11:16:30 -04:00
teor
15900ab70f
Merge remote-tracking branch 'tor-github/pr/819'
2019-03-22 13:10:47 +10:00
George Kadianakis
5729160253
circpad: Rename circpad_machine_state_t to circpad_machine_runtime_t.
...
The name of circpad_machine_state_t was very confusing since it was conflicting
with circpad_state_t and circpad_circuit_state_t.
Right now here is the current meaning of these structs:
circpad_state_t -> A state of the state machine.
circpad_machine_runtime_t -> The current mutable runtime info of the state machine.
circpad_circuit_state_t -> Circuit conditions based on which we should apply a machine to the circuit
2019-03-22 09:23:05 +10:00
George Kadianakis
846d379b50
circpad/prob_distr: Use crypto_fast_rng() instead of the old RNG.
2019-03-22 09:22:54 +10:00
Nick Mathewson
938d97cb0d
Merge branch 'maint-0.4.0'
...
Ours to avoid version bump.
2019-03-21 09:36:40 -04:00
Nick Mathewson
ebc7556dd0
Bump version to 0.4.0.3-alpha
2019-03-21 09:36:19 -04:00
George Kadianakis
bc64fb4e33
circpad: Don't pad if Tor is in dormant mode.
...
This is something we should think about harder, but we probably want dormant
mode to be more powerful than padding in case a client has been inactive for a
day or so. After all, there are probably no circuits open at this point and
dormant mode will not allow the client to open more circuits.
Furthermore, padding should not block dormant mode from being activated, since
dormant mode relies on SocksPort activity, and circuit padding does not mess
with that.
2019-03-21 10:29:04 +10:00
teor
ca26567044
Merge branch 'maint-0.4.0'
2019-03-20 09:48:21 +10:00
teor
3871fb732d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-20 09:48:12 +10:00
teor
41cd05562f
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-20 09:48:03 +10:00
teor
d7a5fdcb74
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-03-20 09:47:55 +10:00
teor
6bf9078ceb
Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5
2019-03-20 09:47:31 +10:00
teor
db2ac3b9fe
Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9
2019-03-20 09:46:10 +10:00
Nick Mathewson
2a49b27b9f
Merge remote-tracking branch 'tor-github/pr/781'
2019-03-19 10:22:31 -04:00
Nick Mathewson
a80131765a
Merge branch 'maint-0.4.0'
2019-03-19 09:32:24 -04:00
Nick Mathewson
de5ab1ef49
Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0
2019-03-19 09:32:05 -04:00
teor
4c22c11136
Merge branch 'maint-0.4.0'
2019-03-19 15:43:42 +10:00
teor
b4483edce0
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-19 15:43:33 +10:00
teor
17e3eea685
Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
2019-03-19 15:43:05 +10:00
teor
af21d126e6
Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge
...
Comment merge.
2019-03-18 11:30:37 +10:00
teor
55865a2c9c
Merge branch 'bug29706_034_minimal_merge' into bug29706_035_minimal_merge
2019-03-18 11:29:20 +10:00
teor
aec6ee201b
test/sr: update sr_state_free() to sr_state_free_all() in a comment
2019-03-18 11:28:34 +10:00
teor
1d0146e2a2
Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
2019-03-18 11:27:59 +10:00
teor
c44ad396f8
test/sr: Clear SRVs after init, and before setup
...
Already merged to 0.4.0 and later in tor-github/pr/776.
Backported to 0.2.9 and later with minor comment changes.
Part of 29706.
2019-03-18 11:12:25 +10:00
George Kadianakis
0aaeec19e7
Satisfy practracker broken by #29665 and #28656 .
2019-03-15 17:13:06 +02:00
Nick Mathewson
677384e276
Merge branch 'maint-0.4.0'
2019-03-15 08:59:30 -04:00
Nick Mathewson
1547fd99a6
Merge branch 'bug28656_035_squashed' into maint-0.4.0
2019-03-15 08:59:19 -04:00
teor
532f4c9103
Stop logging a BUG() warning when tor is waiting for exit descriptors
...
Fixes bug 28656; bugfix on 0.3.5.1-alpha.
2019-03-15 08:57:28 -04:00
Nick Mathewson
1cffacdaf5
Merge branch 'maint-0.4.0'
2019-03-15 08:54:39 -04:00
Nick Mathewson
560ba98dd7
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
2019-03-15 08:54:30 -04:00
Nick Mathewson
af56dece09
Merge branch 'maint-0.4.0'
2019-03-15 08:53:03 -04:00
Nick Mathewson
94523bffdc
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0
2019-03-15 08:52:50 -04:00
David Goulet
aee65084b4
circ: Remove n_mux and p_mux members
...
They are simply not used apart from assigning a pointer and asserting on the
pointer depending on the cell direction.
Closes #29196 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-03-14 23:54:05 -04:00
Nick Mathewson
2d76945052
practracker: Create an exception for an as-yet-nonexistent file.
...
We need a better way to do this.
2019-03-14 09:35:23 -04:00
Roger Dingledine
a3bc950e42
relays shouldn't close idle rend circuits
...
Allow connections to single onion services to remain idle without being
disconnected.
Relays acting as rendezvous points for single onion services were
mistakenly closing idle established rendezvous circuits after 60 seconds,
thinking that they are unused directory-fetching circuits that had served
their purpose.
Fixes bug 29665; bugfix on 0.2.1.26.
2019-03-14 12:54:16 +02:00
George Kadianakis
a55c89c475
practracker: Be compatible with python2 which is used by travis/jenkins.
2019-03-14 02:15:32 +02:00
teor
de61669425
Merge branch 'maint-0.4.0'
2019-03-14 07:00:51 +10:00
teor
feb7253df3
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-14 07:00:43 +10:00
teor
5d41e2223f
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.
2019-03-14 06:59:09 +10:00
teor
e021f89f36
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-03-14 06:56:38 +10:00
teor
f3b17a6b26
Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
2019-03-14 06:56:09 +10:00
teor
c03b1b3f08
Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4
2019-03-14 06:55:57 +10:00
