| commit | efa1c950921659a0f10b9adf30625fba21b3815c | [log] [tgz] |
|---|---|---|
| author | Damien Miller <djm@mindrot.org> | Sat Jan 12 23:10:47 2013 +1100 |
| committer | Damien Miller <djm@mindrot.org> | Sat Jan 12 23:10:47 2013 +1100 |
| tree | 422eb1c5e48024e25358fd1d37959e8e0c13d8fe | |
| parent | 846dc7f21c0dd52bc8cc8f433d464a6561066d00 [diff] [blame] |
- (djm) [regress/integrity.sh] repair botched merge
diff --git a/ChangeLog b/ChangeLog index dd84761..9283055 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -6,6 +6,7 @@ - djm@cvs.openbsd.org 2013/01/12 11:23:53 [regress/cipher-speed.sh regress/integrity.sh regress/try-ciphers.sh] test AES-GCM modes; feedback markus@ + - (djm) [regress/integrity.sh] repair botched merge 20130109 - (djm) OpenBSD CVS Sync