summaryrefslogtreecommitdiff
path: root/src/common/log.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-01-15 10:52:27 -0500
committerNick Mathewson <nickm@torproject.org>2016-01-15 10:52:27 -0500
commit00b13cb09170e5144516698429c29975abe2de10 (patch)
tree2452fdb5a091b8f52b9f9c63b9f8917a5b17ab47 /src/common/log.c
parentd748c193e16bc13b6d00de168e5fff0a372620bc (diff)
parent1722232d78c61238c72a3944b9d1baf5c7792462 (diff)
downloadtor-00b13cb09170e5144516698429c29975abe2de10.tar.gz
tor-00b13cb09170e5144516698429c29975abe2de10.zip
Merge remote-tracking branch 'twstrike/options_test'
Diffstat (limited to 'src/common/log.c')
-rw-r--r--src/common/log.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/common/log.c b/src/common/log.c
index 4a8a7b1165..e0bfcf883c 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1378,4 +1378,3 @@ truncate_logs(void)
}
}
}
-