Merge branch 'maint-0.2.9'

This commit is contained in:
Nick Mathewson 2016-11-06 20:32:21 -05:00
commit 4e15c2cb7d

View File

@ -12,7 +12,8 @@
* on the supported protocol versions for each relay, and also vote on the
* which protocols you should have to support in order to be on the Tor
* network. All Tor instances use these required/recommended protocol versions
* to
* to tell what level of support for recent protocols each relay has, and
* to decide whether they should be running given their current protocols.
*
* The main advantage of these protocol versions numbers over using Tor
* version numbers is that they allow different implementations of the Tor