[elpa] externals/crdt d9ea57d41d 5/5: Merge branch 'no_miredo' into 'master'

[ELPA Syncer]

branch: externals/crdt
commit d9ea57d41db2aa25773bfdd1c12ee8b51b92e61f
Merge: a25188da61 cc1e1da4a0
Author: Qiantan Hong <qhong@alum.mit.edu>
Commit: Qiantan Hong <qhong@alum.mit.edu>

    Merge branch 'no_miredo' into 'master'
    
    doc: remove teredo/miredo, linnk to awesome-tunneling
    
    See merge request qhong/crdt.el!7
---
 README.org | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/README.org b/README.org
index 8a7ce2bd36..b32a34c49d 100644
--- a/README.org
+++ b/README.org
@@ -139,31 +139,18 @@ There're various workaround.
   time to establish a connection (sometimes up to half a minute),
   however it gets much faster after the connection is established.
 
-- You can use Teredo to get a public routable IPv6 address.  One free
-  software implementation is Miredo. Get it from your favorite package
-  manager or from [[https://www.remlab.net/miredo/][their website]].
-  A typical usage is (run as root)
-  #+BEGIN_SRC
-# /usr/local/sbin/miredo
-# ifconfig teredo
-  #+END_SRC
-  The =ifconfig= command should print the information of your IPv6
-  address.  Now your traffic go through IPv6, and once you start a
-  =crdt.el= session, your friends should be able to join using the
-  IPv6 address.  For more information, see the user guide on the
-  Miredo website.
 
 - You can use SSH port forwarding if you have a VPS with public IP.
   Example usage:
-  #+BEGIN_SRC 
+  #+BEGIN_SRC
 $ ssh -R EXAMPLE.COM:6530:127.0.0.1:6530 EXAMPLE.COM
   #+END_SRC
   This make your =crdt.el= session on local port =6530= accessible
   from =EXAMPLE.COM:6530=.
-  
+
   Note that you need to set the following =/etc/ssh/sshd_config=
   option on your VPS
-  #+BEGIN_SRC 
+  #+BEGIN_SRC
 GatewayPorts yes
   #+END_SRC