aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-25Split all controller events code into a new control_events.cNick Mathewson
Also, split the formatting code shared by control.c and control_events.c into controller_fmt.c.
2019-03-25Merge remote-tracking branch 'tor-github/pr/785'teor
2019-03-23forward-port changelog for 0.4.0.3-alphaNick Mathewson
2019-03-23Merge branch 'maint-0.4.0'Nick Mathewson
"ours" to avoid version bump
2019-03-23Bump to 0.4.0.3-alpha-devNick Mathewson
2019-03-22Merge branch 'maint-0.4.0'Nick Mathewson
2019-03-22Merge branch 'bug29693_040_radical_squashed' into maint-0.4.0Nick Mathewson
2019-03-22prob-distr: Decrease false positive rate of stochastic tests.George Kadianakis
2019-03-22Merge remote-tracking branch 'tor-github/pr/819'teor
2019-03-22circpad: Rename circpad_machine_state_t to circpad_machine_runtime_t.George Kadianakis
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-22circpad/prob_distr: Use crypto_fast_rng() instead of the old RNG.George Kadianakis
2019-03-21Merge branch 'maint-0.4.0'Nick Mathewson
Ours to avoid version bump.
2019-03-21Bump version to 0.4.0.3-alphaNick Mathewson
2019-03-21circpad: Don't pad if Tor is in dormant mode.George Kadianakis
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-20Merge branch 'maint-0.4.0'teor
2019-03-20Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-03-20Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-03-20Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-03-20Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5teor
2019-03-20Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9teor
2019-03-19Merge remote-tracking branch 'tor-github/pr/781'Nick Mathewson
2019-03-19Merge branch 'maint-0.4.0'Nick Mathewson
2019-03-19Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0Nick Mathewson
2019-03-19Merge branch 'maint-0.4.0'teor
2019-03-19Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-03-19Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5teor
2019-03-18Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_mergeteor
Comment merge.
2019-03-18Merge branch 'bug29706_034_minimal_merge' into bug29706_035_minimal_mergeteor
2019-03-18test/sr: update sr_state_free() to sr_state_free_all() in a commentteor
2019-03-18Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_mergeteor
2019-03-18test/sr: Clear SRVs after init, and before setupteor
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-15Satisfy practracker broken by #29665 and #28656.George Kadianakis
2019-03-15Merge branch 'maint-0.4.0'Nick Mathewson
2019-03-15Merge branch 'bug28656_035_squashed' into maint-0.4.0Nick Mathewson
2019-03-15Stop logging a BUG() warning when tor is waiting for exit descriptorsteor
Fixes bug 28656; bugfix on 0.3.5.1-alpha.
2019-03-15Merge branch 'maint-0.4.0'Nick Mathewson
2019-03-15Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0Nick Mathewson
2019-03-15Merge branch 'maint-0.4.0'Nick Mathewson
2019-03-15Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0Nick Mathewson
2019-03-14circ: Remove n_mux and p_mux membersDavid Goulet
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-14practracker: Create an exception for an as-yet-nonexistent file.Nick Mathewson
We need a better way to do this.
2019-03-14relays shouldn't close idle rend circuitsRoger Dingledine
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-14practracker: Be compatible with python2 which is used by travis/jenkins.George Kadianakis
2019-03-14Merge branch 'maint-0.4.0'teor
2019-03-14Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-03-14Merge branch 'maint-0.3.4' into maint-0.3.5teor
"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-14Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4teor
2019-03-14Merge branch 'bug28096-029-squashed' into bug28096-034-squashedteor
Merge the new code, and preserve the #else macro comment from 0.3.4.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion