diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-15 18:18:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-15 18:18:52 -0400 |
| commit | 1e48c776910219974193ac0d121067d65bfb9959 (patch) | |
| tree | 71bc192071c25863d700fdf8c6c167c2c34d51ca /tor-spec.txt | |
| parent | f44a8ce77264229e2f9a67eab5fa9928e692dec0 (diff) | |
| parent | 739702d077dc724d58e95758f10ba2876b546026 (diff) | |
| download | torspec-1e48c776910219974193ac0d121067d65bfb9959.tar.gz torspec-1e48c776910219974193ac0d121067d65bfb9959.zip | |
Merge branch 'prop140_completed_squashed'
Diffstat (limited to 'tor-spec.txt')
| -rw-r--r-- | tor-spec.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tor-spec.txt b/tor-spec.txt index 7501246..fdb8535 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1750,6 +1750,8 @@ see tor-design.pdf. "1" -- supports all features in Tor 0.2.4.19. + "2" -- adds support for consensus diffs. + 9.8. "Desc" Describes features present or absent in descriptors. |