]> git.deb.at Git - rhonda/impostor.hazel.git/commit
Merge remote-tracking branch 'upstream/master'
authorjs6pak <kubastaron@hotmail.com>
Wed, 10 Nov 2021 13:57:11 +0000 (14:57 +0100)
committerjs6pak <kubastaron@hotmail.com>
Wed, 10 Nov 2021 14:00:20 +0000 (15:00 +0100)
commit74070b8c0798f9a8889d65d3bf5b54f2ef55f4c3
tree47bec6a061537c06d0f2014f14ebd190fa04ea1f
parent6bc1d7374e04a9c1efb5b898239dcd486962eac2
parent98d9f5d2c8664b19707907d1a7ca4863ec3e396a
Merge remote-tracking branch 'upstream/master'

# Conflicts:
# Hazel.UnitTests/ThreadLimitedUdpConnectionTests.cs
# Hazel.UnitTests/UnityUdpConnectionTests.cs
# Hazel/FewerThreads/ThreadLimitedUdpConnectionListener.cs
# Hazel/Hazel.csproj
# README.md
Hazel.UnitTests/ThreadLimitedUdpConnectionTests.cs
Hazel.UnitTests/UnityUdpConnectionTests.cs
Hazel/Crypto/AesGcm.cs
Hazel/Crypto/CryptoProvider.cs
Hazel/Crypto/DefaultAes.cs
Hazel/Crypto/IAes.cs
Hazel/FewerThreads/ThreadLimitedUdpConnectionListener.cs
Hazel/Hazel.csproj