sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2016-12-02 12:10:33 -05:00
parent ef7df10972 907cd8a0cf
commit 567852fcde
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug20810 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (relay)
- When computing old Tor protocol line version in protover, we were
looking at 0.2.7.5 twice instead of a specific case for 0.2.9.1-alpha.
Bugfix on tor-0.2.9.4-alpha.

2
src/or/protover.c
View File

@ -697,7 +697,7 @@ protover_compute_for_old_tor(const char *version)
if (tor_version_as_new_as(version,
FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS)) {
return "";
} else if (tor_version_as_new_as(version, "0.2.7.5")) {
} else if (tor_version_as_new_as(version, "0.2.9.1-alpha")) {
/* 0.2.9.1-alpha HSRend=2 */
return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1-2 "
"Link=1-4 LinkAuth=1 "