Also, split the formatting code shared by control.c and
control_events.c into controller_fmt.c.

"ours" to avoid version bump

George Kadianakis authored Mar 13, 2019 and teor committed Mar 22, 2019

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

Ours to avoid version bump.

George Kadianakis authored Mar 13, 2019 and teor committed Mar 21, 2019

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.

Comment merge.

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.

teor authored Mar 05, 2019 and Nick Mathewson committed Mar 15, 2019

Fixes bug 28656; bugfix on 0.3.5.1-alpha.