diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-16 11:15:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-16 11:15:29 -0400 |
| commit | f152081de174fbd0e097e97d7d76d6b401dcd194 (patch) | |
| tree | 37b745d3204709db1fafd4f7baf1a5e6de427260 /src/or/circuitbuild.c | |
| parent | cc10f13408e25eaf04f849d0f761680f383fa61d (diff) | |
| parent | 56061976dbe148dc615c8072c962ddfc0d719585 (diff) | |
| download | tor-f152081de174fbd0e097e97d7d76d6b401dcd194.tar.gz tor-f152081de174fbd0e097e97d7d76d6b401dcd194.zip | |
Merge remote-tracking branch 'arma/ticket8766'
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 946c002735..985234fded 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1053,6 +1053,10 @@ circuit_note_clock_jumped(int seconds_elapsed) "CLOCK_JUMPED"); circuit_mark_all_unused_circs(); circuit_mark_all_dirty_circs_as_unusable(); + if (seconds_elapsed < 0) { + /* Restart all the timers in case we jumped a long way into the past. */ + reset_all_main_loop_timers(); + } } /** Take the 'extend' <b>cell</b>, pull out addr/port plus the onion |