Commit a445daf0 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote branch 'sebastian/bug1776_v3'

parents 424ca963 33ae3f4b

changes/bug1776_v3

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Really allow clients to use relays as bridges. Fixes bug 1776;

      bugfix on 0.2.2.15-alpha.

src/or/routerlist.c

+4 −2
Original line number Diff line number Diff line
@@ -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

     * descriptor, replace it. If we had a bridge descriptor before and the

     * new one is not a bridge descriptor, don't replace it. */

    if (old_router && (!routerinfo_is_a_configured_bridge(router) ||

                routerinfo_is_a_configured_bridge(old_router))) {

    tor_assert(old_router);

    if (! (routerinfo_is_a_configured_bridge(router) &&

            (router->purpose == ROUTER_PURPOSE_BRIDGE ||

             old_router->purpose != ROUTER_PURPOSE_BRIDGE))) {

      log_info(LD_DIR,

               "Dropping descriptor that we already have for router '%s'",

               router->nickname);