Skip to content

Commit

Permalink
Misc
Browse files Browse the repository at this point in the history
Update readme
  • Loading branch information
breakwa11 committed Jan 4, 2017
1 parent bb5c6cb commit 363d6e2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 25 deletions.
30 changes: 11 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,32 @@
Shadowsocks for Windows
ShadowsocksR for Windows
=======================

[![Build Status]][Appveyor]

#### Features

1. System proxy configuration
2. Fast profile switching
3. PAC mode and global mode
4. GFWList and user rules
5. Supports HTTP proxy
6. Supports UDP relay (see Usage)

#### Download

Download a [latest release].

For >= Windows 8 or with .Net 4.0, download Shadowsocks-win-dotnet4.0-x.x.x.zip.
For >= Windows 8 or with .Net 4.0, using ShadowsocksR-dotnet4.0.exe.

For <= Windows 7 or with .Net 2.0, download Shadowsocks-win-x.x.x.zip.
For <= Windows 7 or with .Net 2.0, using ShadowsocksR-dotnet2.0.exe.

#### Usage

1. Find Shadowsocks icon in the notification tray
1. Find ShadowsocksR icon in the notification tray
2. You can add multiple servers in servers menu
3. Select Enable System Proxy menu to enable system proxy. Please disable other
proxy addons in your browser, or set them to use system proxy
4. You can also configure your browser proxy manually if you don't want to enable
system proxy. Set Socks5 or HTTP proxy to 127.0.0.1:1080. You can change this
port in Server -> Edit Servers
port in Global settings
5. You can change PAC rules by editing the PAC file. When you save the PAC file
with any editor, Shadowsocks will notify browsers about the change automatically
with any editor, ShadowsocksR will notify browsers about the change automatically
6. You can also update the PAC file from GFWList. Note your modifications to the PAC
file will be lost. However you can put your rules in the user rule file for GFWList.
Don't forget to update from GFWList again after you've edited the user rule
7. For UDP, you need to use SocksCap or ProxyCap to force programs you want
to proxy to tunnel over Shadowsocks
to proxy to tunnel over ShadowsocksR

### Develop

Expand All @@ -45,7 +36,8 @@ Visual Studio Express 2012 is recommended.

GPLv3

Copyright © BreakWa11 2017. Fork from Shadowsocks by clowwindy

[Appveyor]: https://ci.appveyor.com/project/clowwindy/shadowsocks-csharp
[Build Status]: https://ci.appveyor.com/api/projects/status/gknc8l1lxy423ehv/branch/master
[latest release]: https://github.com/shadowsocks/shadowsocks-windows/releases
[Appveyor]: https://ci.appveyor.com/project/breakwa11/shadowsocksr-csharp
[Build Status]: https://ci.appveyor.com/api/projects/status/itcxnad1y95gf2x5/branch/master?svg=true
[latest release]: https://github.com/shadowsocksr/shadowsocksr-csharp/releases
2 changes: 1 addition & 1 deletion shadowsocks-csharp/Controller/UpdateChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class UpdateChecker
public event EventHandler NewVersionFound;

public const string Name = "ShadowsocksR";
public const string Copyright = "Copyright © BreakWall 2016. Fork from Shadowsocks by clowwindy";
public const string Copyright = "Copyright © BreakWa11 2017. Fork from Shadowsocks by clowwindy";
public const string Version = "4.0.4";
#if !_DOTNET_4_0
public const string NetVer = "2.0";
Expand Down
5 changes: 0 additions & 5 deletions shadowsocks-csharp/View/ConfigForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ private void LoadSelectedServer()
_SelectedID = server.id;

ServerGroupBox.Visible = true;
bool ssr = false;

if (TCPProtocolComboBox.Text == "origin"
&& obfs_text == "plain"
Expand All @@ -342,10 +341,6 @@ private void LoadSelectedServer()
{
checkAdvSetting.Checked = false;
}
else
{
ssr = true;
}

if (checkSSRLink.Checked)
{
Expand Down

0 comments on commit 363d6e2

Please sign in to comment.