diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-30 07:36:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-30 07:36:55 -0500 |
| commit | fac8d40886a03d442ed9f8c18df5ed017b1e6dd0 (patch) | |
| tree | ebaa6185038792b896ce0f7fc147ef1a67f08599 /doc/tor.1.txt | |
| parent | d1e52d9a2a26c1bf9f80b237e692c72517c30495 (diff) | |
| parent | b4a8fd895802801198229574c55b3df975aa2244 (diff) | |
| download | tor-fac8d40886a03d442ed9f8c18df5ed017b1e6dd0.tar.gz tor-fac8d40886a03d442ed9f8c18df5ed017b1e6dd0.zip | |
Merge remote-tracking branch 'public/prop227_v2'
Conflicts:
src/test/test_dir.c
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 90dad545c7..99ab8cb0b3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1886,6 +1886,12 @@ on the public Tor network. multiple times: the values from multiple lines are spliced together. When this is set then **VersioningAuthoritativeDirectory** should be set too. +[[RecommendedPackageVersions]] **RecommendedPackageVersions** __PACKAGENAME__ __VERSION__ __URL__ __DIGESTTYPE__**=**__DIGEST__ :: + Adds "package" line to the directory authority's vote. This information + is used to vote on the correct URL and digest for the released versions + of different Tor-related packages, so that the consensus can certify + them. This line may appear any number of times. + [[RecommendedClientVersions]] **RecommendedClientVersions** __STRING__:: STRING is a comma-separated list of Tor versions currently believed to be safe for clients to use. This information is included in version 2 |