diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
| commit | dfdd46db80331104366747e336323095aba2c886 (patch) | |
| tree | 9d7d65a6fcee14f59b9e07dca248a9ae3e180e4e /tcp-proxy | |
| parent | c59c74dddab862ade65938e630dc0f561fcb0c2f (diff) | |
| parent | 87bb0086deadf3663c3e0ec1308e0d71a6473362 (diff) | |
| download | infinitytier-dfdd46db80331104366747e336323095aba2c886.tar.gz infinitytier-dfdd46db80331104366747e336323095aba2c886.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'tcp-proxy')
| -rw-r--r-- | tcp-proxy/tcp-proxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tcp-proxy/tcp-proxy.cpp b/tcp-proxy/tcp-proxy.cpp index f7ba2c2f..6acf7b42 100644 --- a/tcp-proxy/tcp-proxy.cpp +++ b/tcp-proxy/tcp-proxy.cpp @@ -85,7 +85,7 @@ using namespace ZeroTier; * in which every encapsulated ZT packet is prepended by an IP address where * it should be forwarded (or where it came from for replies). This causes * this proxy to act as a remote UDP socket similar to a socks proxy, which - * will allow us to move this function off the supernodes and onto dedicated + * will allow us to move this function off the rootservers and onto dedicated * proxy nodes. * * Older ZT clients that do not send this message get their packets relayed |