master
Remove pre-NT compat code from AddToPath.nsh
Merge Nmap 7.96 release branch
Win32 installer improvements:
merge soc07 r5308:5317 - finish umit win build integration