diff options
| author | Bluesaxorcist <joshua@operatorfoundation.org> | 2019-08-16 16:13:29 -0500 |
|---|---|---|
| committer | Bluesaxorcist <joshua@operatorfoundation.org> | 2019-08-16 16:13:29 -0500 |
| commit | de0045f275c7d85fefa166d16ab0747f82c2db85 (patch) | |
| tree | e287cb7888606574bdaa24deacfe7d24daffa215 | |
| parent | d8ce35ae3fea54b0ad67f2ce94fca8a0f99941ea (diff) | |
| parent | 2c9d5e92009abf56d777e1ff2a85bc7539c74474 (diff) | |
Merge branch 'master' of https://github.com/OperatorFoundation/shapeshifter-dispatcher
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | transports/transports.go | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -2,3 +2,8 @@ *~ obfs4proxy/obfs4proxy +state/obfs4_state.json +common/.DS_Store +state/dispatcher.log +state/obfs4_bridgeline.txt +.DS_Store diff --git a/transports/transports.go b/transports/transports.go index cf8fdc7..e435423 100644 --- a/transports/transports.go +++ b/transports/transports.go @@ -31,5 +31,5 @@ package transports // Transports returns the list of registered transport protocols. func Transports() []string { - return []string{"obfs2", "shadow", "obfs4"} + return []string{"obfs2", "shadow", "obfs4", "Optimizer"} } |