diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-14 23:06:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-14 23:06:43 -0400 |
| commit | 0d946e1773da2a7cf5fa22ff9c62700985b26f7f (patch) | |
| tree | 04a57a5f470fa47badadeda8c8e3353db64e90d6 /src/or/main.c | |
| parent | 38b79473864fb662215761f650e8e03b7c518cd7 (diff) | |
| parent | 3d31771da9fcd0be5db21ac19a34d978bfe6d78d (diff) | |
| download | tor-0d946e1773da2a7cf5fa22ff9c62700985b26f7f.tar.gz tor-0d946e1773da2a7cf5fa22ff9c62700985b26f7f.zip | |
Merge remote-tracking branch 'arma/bug7029'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index e0c89a919b..79fe06eea7 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2503,6 +2503,10 @@ tor_free_all(int postfork) smartlist_free(closeable_connection_lst); smartlist_free(active_linked_connection_lst); periodic_timer_free(second_timer); +#ifndef USE_BUFFEREVENTS + periodic_timer_free(refill_timer); +#endif + if (!postfork) { release_lockfile(); } |