Merge branch 'bug1184'
tree5fc2b8b7ff42010e6e714eddc12bfb9e61489314
-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-- 80476 control-spec.txt
-rw-r--r-- 13200 dir-spec-v1.txt
-rw-r--r-- 41900 dir-spec-v2.txt
-rw-r--r-- 101296 dir-spec.txt
-rw-r--r-- 28797 path-spec.txt
drwxr-xr-x - proposals
-rw-r--r-- 46354 rend-spec.txt
-rw-r--r-- 3278 socks-extensions.txt
-rw-r--r-- 46974 tor-spec.txt
-rw-r--r-- 2147 version-spec.txt