Merge branch 'bug28780-squashed3-rebased' into bug28780_rebase

diff --cc scripts/maint/practracker/exceptions.txt
Simple merge

diff --cc src/core/or/circuitpadding.c
index cd58a191d64462ca7a1e21e80b50da40974a87c9,68140356c95c21c03c41d88c1536215b88452674..ddf28ea62494f399aa5337e8bd8ed747f0868d1d
--- 1/src/core/or/circuitpadding.c
--- 2/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@@ -1649,16 -1649,13 +1760,17 @@@ circpad_cell_event_nonpadding_sent(circ
  
    /* If there are no machines then this loop should not iterate */
    FOR_EACH_ACTIVE_CIRCUIT_MACHINE_BEGIN(i, on_circ) {
-     /* First, update any RTT estimate */
+     /* First, update any timestamps */
+     on_circ->padding_info[i]->last_cell_time_sec = approx_time();
      circpad_estimate_circ_rtt_on_send(on_circ, on_circ->padding_info[i]);
  
 -    /* Remove a token: this is the idea of adaptive padding, since we have an
 -     * ideal distribution that we want our distribution to look like. */
 -    if (!circpad_machine_remove_token(on_circ->padding_info[i])) {
 +    /* Then, do accounting */
 +    circpad_machine_count_nonpadding_sent(on_circ->padding_info[i]);
 +
 +    /* Check to see if we've run out of tokens for this state already,
 +     * and if not, check for other state transitions */
 +    if (check_machine_token_supply(on_circ->padding_info[i])
 +        == CIRCPAD_STATE_UNCHANGED) {
        /* If removing a token did not cause a transition, check if
         * non-padding sent event should */
        circpad_machine_spec_transition(on_circ->padding_info[i],
@@@ -1699,16 -1697,9 +1812,17 @@@ voi
  circpad_cell_event_padding_sent(circuit_t *on_circ)
  {
    FOR_EACH_ACTIVE_CIRCUIT_MACHINE_BEGIN(i, on_circ) {
 -    on_circ->padding_info[i]->last_cell_time_sec = approx_time();
 -    circpad_machine_spec_transition(on_circ->padding_info[i],
 +    /* Check to see if we've run out of tokens for this state already,
 +     * and if not, check for other state transitions */
 +    if (check_machine_token_supply(on_circ->padding_info[i])
 +        == CIRCPAD_STATE_UNCHANGED) {
 +      /* If removing a token did not cause a transition, check if
 +       * non-padding sent event should */
 +
++      on_circ->padding_info[i]->last_cell_time_sec = approx_time();
 +      circpad_machine_spec_transition(on_circ->padding_info[i],
                               CIRCPAD_EVENT_PADDING_SENT);
 +    }
    } FOR_EACH_ACTIVE_CIRCUIT_MACHINE_END;
  }
  

diff --cc src/core/or/circuitpadding.h
Simple merge

diff --cc src/test/test_circuitpadding.c
Simple merge