Commit 53c3174e authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.8' into maint-0.2.9

parents 1b9bb2c8 d388f9d8

changes/bug18329-minimal

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Minor features (bridge):

    - Bridges now include notice in their descriptors that they are bridges,

      and notice of their distribution status, based on their publication

      settings.  Implements ticket 18329.  For more fine-grained control of

      how a bridge is distributed, upgrade to 0.3.2.x or later.

src/or/router.c

+9 −0
Original line number Diff line number Diff line
@@ -2867,6 +2867,15 @@ router_dump_router_to_string(routerinfo_t *router, 
    smartlist_add_asprintf(chunks, "contact %s\n", ci);

  }



  if (options->BridgeRelay) {

    const char *bd;

    if (options->PublishServerDescriptor_ & BRIDGE_DIRINFO)

      bd = "any";

    else

      bd = "none";

    smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd);

  }



  if (router->onion_curve25519_pkey) {

    char kbuf[128];

    base64_encode(kbuf, sizeof(kbuf),