Merge remote branch 'mikeperry/consensus-bw-weights5-merge'
treef79c3b4f7ea012f84baa2ee00506586b6ed78117
-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-- 79765 control-spec.txt
-rw-r--r-- 13200 dir-spec-v1.txt
-rw-r--r-- 41900 dir-spec-v2.txt
-rw-r--r-- 100628 dir-spec.txt
-rw-r--r-- 21119 path-spec.txt
drwxr-xr-x - proposals
-rw-r--r-- 34332 rend-spec.txt
-rw-r--r-- 3278 socks-extensions.txt
-rw-r--r-- 46296 tor-spec.txt
-rw-r--r-- 2147 version-spec.txt