diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-05-09 10:00:43 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-05-15 18:18:25 -0400 |
commit | 739702d077dc724d58e95758f10ba2876b546026 (patch) | |
tree | 110db94e119a4e51dfb40bf657dae625d65851a9 /tor-spec.txt | |
parent | 21caa46a1f2064d60755df3aebf4447edf2189fb (diff) | |
download | torspec-739702d077dc724d58e95758f10ba2876b546026.tar.gz torspec-739702d077dc724d58e95758f10ba2876b546026.zip |
Merge prop140 into dir-spec.txt
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 927173b..ccbe7fb 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. |