nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rl1987/bug25477'

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-17 20:25:40 -04:00
commit 16dd2f7bb0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug25477 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (logging):
- Refrain from mentioning bug 21018, as it is already fixed.
Fixes bug 25477; bugfix on 0.2.9.8.

4
src/or/rendcache.c
View File

@ -908,9 +908,7 @@ rend_cache_store_v2_desc_as_client(const char *desc,
if (n_intro_points <= 0) {
log_warn(LD_REND, "Failed to parse introduction points. Either the "
"service has published a corrupt descriptor or you have "
"provided invalid authorization data, or (maybe!) the "
"server is deliberately serving broken data in an attempt "
"to crash you with bug 21018.");
"provided invalid authorization data.");
goto err;
} else if (n_intro_points > MAX_INTRO_POINTS) {
log_warn(LD_REND, "Found too many introduction points on a hidden "