Merge remote branch 'origin/maint-0.2.2'
tree25eb84667fde3f1d4942c1d13f49a46da987a33b
-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-- 83515 control-spec.txt
-rw-r--r-- 13200 dir-spec-v1.txt
-rw-r--r-- 41900 dir-spec-v2.txt
-rw-r--r-- 104069 dir-spec.txt
-rw-r--r-- 29327 path-spec.txt
drwxr-xr-x - proposals
-rw-r--r-- 46354 rend-spec.txt
-rw-r--r-- 3278 socks-extensions.txt
-rw-r--r-- 2201 tor-fw-helper-spec.txt
-rw-r--r-- 46974 tor-spec.txt
-rw-r--r-- 2147 version-spec.txt