##// END OF EJS Templates
merge with stable...
merge with stable There were a handful of merge conflicts in the wire protocol code due to significant refactoring in default. When resolving the conflicts, I tried to produce the minimal number of changes to make the incoming security patches work with the new code. I will send some follow-up commits to get the security patches better integrated into default.

File last commit:

r30822:b54a2984 default
r36778:7bf80d9d merge default
Show More
MANIFEST.in
5 lines | 81 B | text/plain | TextLexer
graft c-ext
graft zstd
include make_cffi.py
include setup_zstd.py
include zstd.c