Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-24 11:56:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '2dust:master' into master

Browse source
This commit is contained in:
JaredDC 2021-07-16 12:29:48 +08:00 committed by GitHub
commit c6b95ebab0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
View file

@ -166,7 +166,7 @@ namespace v2rayN.HttpProxyHandler
}
if (type == ESysProxyType.ForcedChange)
{
SysProxyHandle.SetIEProxy(true, $"{Global.httpProtocol}{Global.Loopback}:{port}", config.systemProxyExceptions);
SysProxyHandle.SetIEProxy(true, $"{Global.Loopback}:{port}", config.systemProxyExceptions);
}
else if (type == ESysProxyType.ForcedClear)
{

2
v2rayN/v2rayN/Properties/AssemblyInfo.cs
View file

@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
// 方法是按如下所示使用“*”:
//[assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyFileVersion("4.19")]
[assembly: AssemblyFileVersion("4.20")]