Skip to content

Commit ab1ddac

Browse files
committed
Merge remote-tracking branch 'upstream/master' into submodule
Conflicts: external/source/exploits/cve-2013-3660/dll/reflective_dll.vcxproj
2 parents 6edd9aa + 0c5d748 commit ab1ddac

File tree

116 files changed

+2459
-1515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+2459
-1515
lines changed

.mailmap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ wchen-r7 <wchen-r7@github> sinn3r <[email protected]> # aka sinn3r
2020
wchen-r7 <wchen-r7@github> sinn3r <[email protected]>
2121
wchen-r7 <wchen-r7@github> Wei Chen <[email protected]>
2222
wvu-r7 <wvu-r7@github> William Vu <[email protected]>
23-
wvu-r7 <wvu-r7@github> William Vu <wvu@nmt.edu>
23+
wvu-r7 <wvu-r7@github> William Vu <wvu@metasploit.com>
2424

2525
# Above this line are current Rapid7 employees. Below this paragraph are
2626
# volunteers, former employees, and potential Rapid7 employees who, at
@@ -40,8 +40,8 @@ Chao-mu <Chao-Mu@github> chao-mu <[email protected]>
4040
Chao-mu <Chao-Mu@github> chao-mu <chao@confusion.(none)>
4141
ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
4242
ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
43-
corelanc0d3er <corelanc0d3er@github> corelanc0d3r <[email protected]>
44-
corelanc0d3er <corelanc0d3er@github> Peter Van Eeckhoutte (corelanc0d3r) <[email protected]>
43+
corelanc0d3r <corelanc0d3r@github> corelanc0d3r <[email protected]>
44+
corelanc0d3r <corelanc0d3r@github> Peter Van Eeckhoutte (corelanc0d3r) <[email protected]>
4545
darkoperator <darkoperator@github> Carlos Perez <[email protected]>
4646
efraintorres <efraintorres@github> efraintorres <[email protected]>
4747
efraintorres <efraintorres@github> et <>
-50 KB
Binary file not shown.
Binary file not shown.

data/meterpreter/elevator.x64.dll

0 Bytes
Binary file not shown.

data/meterpreter/elevator.x86.dll

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)