diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-02 12:10:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-02 12:10:39 -0500 |
| commit | ca4a0ae0b18c2f3f14eb7a6243b52f5769216aa0 (patch) | |
| tree | d029b3ded1c442b34000e3280684649df8173907 | |
| parent | ed4213fa08a92af6fed2ddc5dda1747f2af25e50 (diff) | |
| parent | 907cd8a0cfb6da08450902ebb2f21db3cd65e7f7 (diff) | |
| download | tor-ca4a0ae0b18c2f3f14eb7a6243b52f5769216aa0.tar.gz tor-ca4a0ae0b18c2f3f14eb7a6243b52f5769216aa0.zip | |
Merge branch 'maint-0.2.9'
| -rw-r--r-- | changes/bug20810 | 4 | ||||
| -rw-r--r-- | src/or/protover.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug20810 b/changes/bug20810 new file mode 100644 index 0000000000..5420a73175 --- /dev/null +++ b/changes/bug20810 @@ -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. diff --git a/src/or/protover.c b/src/or/protover.c index 5972e61be7..ceaf2d5ccf 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -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 " |