| #
7d9ffdb3 |
| 08-Sep-2024 |
christos <christos@NetBSD.org> |
merge and regen between 3.0.1[45]
|
| #
b46c97fe |
| 11-Jun-2024 |
christos <christos@NetBSD.org> |
Merge conflicts between 3.0.12 and 3.0.14
|
| #
8dcce544 |
| 25-Oct-2023 |
christos <christos@NetBSD.org> |
Merge conflicts between 3.0.9 and 3.0.12
|
| #
d6e24a89 |
| 31-May-2023 |
christos <christos@NetBSD.org> |
merge conflicts between 3.0.8 and 3.0.9
|
| #
8fbed61e |
| 07-May-2023 |
christos <christos@NetBSD.org> |
merge conflicts between 1.1.1t and 3.0.8
|
| #
be43b372 |
| 07-Feb-2023 |
christos <christos@NetBSD.org> |
merge changes between openssl 1.1.1n and 1.1.1t
|
| #
9330ead5 |
| 15-Mar-2022 |
christos <christos@NetBSD.org> |
merge OpenSSL-1.1.1m and OpenSSL-1.1.1n
|
| #
fb48e4b2 |
| 07-Jan-2022 |
christos <christos@NetBSD.org> |
merge conflicts between openssl-1-1-1k and openssl-1-1-1m
|
| #
c50ed29d |
| 20-Feb-2021 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
4a7cf967 |
| 10-Dec-2020 |
christos <christos@NetBSD.org> |
merge conflicts, regen
|
| #
52629741 |
| 22-Mar-2020 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
403eeac4 |
| 23-Jan-2020 |
christos <christos@NetBSD.org> |
resolve conflicts
|
| #
4261787c |
| 09-Jun-2019 |
christos <christos@NetBSD.org> |
merge conflicts, regen man pages.
|
| #
65b9e620 |
| 12-Mar-2019 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
bf8eace1 |
| 08-Dec-2018 |
christos <christos@NetBSD.org> |
Merge conflicts
|
| #
e0ea3921 |
| 23-Sep-2018 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
2500041c |
| 18-Aug-2018 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
78327f04 |
| 06-Apr-2018 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
5af53050 |
| 08-Feb-2018 |
christos <christos@NetBSD.org> |
merged conflicts
|
| #
b367ed38 |
| 27-Jan-2017 |
spz <spz@NetBSD.org> |
merge for OpenSSL 1.0.2k
|
| #
31b855a0 |
| 14-Oct-2016 |
spz <spz@NetBSD.org> |
merge for openssl 1.0.2j
|
| #
338c2544 |
| 02-Mar-2016 |
christos <christos@NetBSD.org> |
merge conflicts, bump libraries to 11 for consistency.
|
| #
4060c40e |
| 30-Jan-2016 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
261bb388 |
| 06-Dec-2015 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
2dedb221 |
| 12-Jun-2015 |
christos <christos@NetBSD.org> |
merge conflicts, restore binary compatibility in hmac, regen.
|