nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'sebastian/bug1776_v3'

Browse Source
This commit is contained in:
Nick Mathewson 2010-09-14 13:50:28 -04:00
commit a445daf0cf
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug1776_v3 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- Really allow clients to use relays as bridges. Fixes bug 1776;
bugfix on 0.2.2.15-alpha.

6
src/or/routerlist.c
View File

@ -3176,8 +3176,10 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
/* If we have this descriptor already and the new descriptor is a bridge /* If we have this descriptor already and the new descriptor is a bridge
* descriptor, replace it. If we had a bridge descriptor before and the * descriptor, replace it. If we had a bridge descriptor before and the
* new one is not a bridge descriptor, don't replace it. */ * new one is not a bridge descriptor, don't replace it. */
if (old_router && (!routerinfo_is_a_configured_bridge(router) || tor_assert(old_router);
routerinfo_is_a_configured_bridge(old_router))) { if (! (routerinfo_is_a_configured_bridge(router) &&
(router->purpose == ROUTER_PURPOSE_BRIDGE ||
old_router->purpose != ROUTER_PURPOSE_BRIDGE))) {
log_info(LD_DIR, log_info(LD_DIR,
"Dropping descriptor that we already have for router '%s'", "Dropping descriptor that we already have for router '%s'",
router->nickname); router->nickname);