aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJacob Appelbaum <jacob@appelbaum.net>2013-03-20 15:38:56 -0400
committerJacob Appelbaum <jacob@appelbaum.net>2013-03-20 15:38:56 -0400
commit049da9b7488eba77111d4820c3a6579491652c31 (patch)
tree131f915a86906d6db155d908b76e4e0386cb0a8c /CHANGELOG
parent19b812b4e284be15eea7d150d6fe761c504457ef (diff)
downloadtlsdate-049da9b7488eba77111d4820c3a6579491652c31.tar.gz
Merge conflict issues
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 0 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2c5db77..7806fa2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,8 +4,6 @@
Fix a race in tlsdate-dbus-announce that can cause signal drops.
Support -l argument to tlsdated.
Pass -l and -v arguments from tlsdated to tlsdate.
- Log more verbosely at tlsdated startup.
- Add FreeBSD support for tlsdate and tlsdate-helper.
0.0.6 Mon 18 Feb, 2013
Ensure that tlsdate compiles with g++ by explicit casting rather than
implicit casting by whatever compiler is compiling tlsdate.