Merge 148 into tor-spec, mark it Closed, and check off proposal 148 in TODO.021
treebdecf8fc86e470472909e3b7afb20d1d5c26ad8f
-rw-r--r-- 2378 address-spec.txt
-rw-r--r-- 10910 bridges-spec.txt
-rw-r--r-- 19949 control-spec-v0.txt
-rw-r--r-- 73518 control-spec.txt
-rw-r--r-- 13203 dir-spec-v1.txt
-rw-r--r-- 41907 dir-spec-v2.txt
-rw-r--r-- 81240 dir-spec.txt
-rw-r--r-- 19750 path-spec.txt
drwxr-xr-x - proposals
-rw-r--r-- 35344 rend-spec.txt
-rw-r--r-- 3283 socks-extensions.txt
-rw-r--r-- 45174 tor-spec.txt
-rw-r--r-- 2152 version-spec.txt