Merge remote-tracking branch 'origin/impacket_1694' into impacket_1694 · fortra/impacket@7a1b35c · GitHub

Commit

Merge remote-tracking branch 'origin/impacket_1694' into impacket_1694

Browse files

# Conflicts:
#	examples/ntlmrelayx.py
#	impacket/examples/ntlmrelayx/servers/httprelayserver.py
#	impacket/examples/ntlmrelayx/servers/smbrelayserver.py
#	impacket/examples/ntlmrelayx/utils/config.py

Loading branch information

alexisbalbachan committed May 3, 2024

2 parents 3c9251a + 741cfaf commit 7a1b35c