Merge branch 'master' of https://github.com/EmpireProject/Empire

Author: xorrior

changelog

@@ -1,25 +1,26 @@
-Running
+10/12/2017
 --------
-- Update crontab to work hourly #667
-- Update keylogger to log to disk on server side by @clr2of8 
-- Fix macro launcher #681
-- Fixes vbscript string literal quoting. #702
-- Add option to host a stager payload in the http listener @424f424f
-- Add @enigma0x3 Token Manipulation script as a BypassUAC module @424f424f
-- Hide true host name when using domain fronting #730 @clr2of8
-- Fixed custom proxy config in launcher code #728 @dirkjanm
-- generate_upload function added to Stagers #722 @hightopfade
-- Aes kerberoast #725 @elitest
-- DBX Improvements (SOCKS, Hide window via WindowHandler) #721 @IljaSchumacher
-- Improved ScriptBlock logging bypasses #740 @cobbr_io
-- Slack Integration - Notification for new Agents #737 @dchrastil
-- Improve Get-ChromeDump #734 @ThePirateWhoSmellsOfSunFlowers
-- Fix Eternal Blue Issue #656
-- Merge Invoke-Kerberoast: Print hashes only. Formatting with a text editor is no longer required. #663
-- Fix Macro syntax error per @utkusen issue #664 
-- Fix Better powershell install, obfuscation bug fixes, fixed vbs/macro launchers #686 @cobbr
-- Fix creds manual add parsing with whitespace in password
-- Fix validate length parameter attribute for Invoke-PSInject.ps1d
+- Version 2.2 Master Release
+	- Update crontab to work hourly #667
+	- Update keylogger to log to disk on server side by @clr2of8 
+	- Fix macro launcher #681
+	- Fixes vbscript string literal quoting. #702
+	- Add option to host a stager payload in the http listener @424f424f
+	- Add @enigma0x3 Token Manipulation script as a BypassUAC module @424f424f
+	- Hide true host name when using domain fronting #730 @clr2of8
+	- Fixed custom proxy config in launcher code #728 @dirkjanm
+	- generate_upload function added to Stagers #722 @hightopfade
+	- Aes kerberoast #725 @elitest
+	- DBX Improvements (SOCKS, Hide window via WindowHandler) #721 @IljaSchumacher
+	- Improved ScriptBlock logging bypasses #740 @cobbr_io
+	- Slack Integration - Notification for new Agents #737 @dchrastil
+	- Improve Get-ChromeDump #734 @ThePirateWhoSmellsOfSunFlowers
+	- Fix Eternal Blue Issue #656
+	- Merge Invoke-Kerberoast: Print hashes only. Formatting with a text editor is no longer required. #663
+	- Fix Macro syntax error per @utkusen issue #664 
+	- Fix Better powershell install, obfuscation bug fixes, fixed vbs/macro launchers #686 @cobbr
+	- Fix creds manual add parsing with whitespace in password
+	- Fix validate length parameter attribute for Invoke-PSInject.ps1d
 
 8/28/2017
 --------