Merge branch 'feature3049-squashed'
tree027fe7ccfbf54623bda6f239f2838b1eb0a071d2
-rw-r--r-- 83 .gitignore
-rw-r--r-- 2069 address-spec.txt
-rw-r--r-- 10905 bridges-spec.txt
-rw-r--r-- 19944 control-spec-v0.txt
-rw-r--r-- 86544 control-spec.txt
-rw-r--r-- 13200 dir-spec-v1.txt
-rw-r--r-- 41900 dir-spec-v2.txt
-rw-r--r-- 104336 dir-spec.txt
-rw-r--r-- 29318 path-spec.txt
drwxr-xr-x - proposals
-rw-r--r-- 46540 rend-spec.txt
-rw-r--r-- 3278 socks-extensions.txt
-rw-r--r-- 2201 tor-fw-helper-spec.txt
-rw-r--r-- 47851 tor-spec.txt
-rw-r--r-- 2169 version-spec.txt