1 files changed, 11 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 83a59fcd07..a555900ec0 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1732,9 +1732,19 @@ extend_info_from_router(routerinfo_t *r)
   info->onion_key = crypto_pk_dup_key(r->onion_pkey);
   info->addr = r->addr;
   info->port = r->or_port;
+  info->router_purpose = r->purpose;
   return info;
 }
 
+/** What router purpose is <b>digest</b>?
+ * It's a general purpose router unless it's on our bridges list.
+ */
+static uint8_t
+get_router_purpose_from_digest(char *digest) {
+  (void)digest;
+  return ROUTER_PURPOSE_GENERAL; /* XXX020 */
+}
+
 /** Allocate and return a new extend_info_t that can be used to build a
  * circuit to or through the router <b>r</b>. */
 extend_info_t *
@@ -1748,6 +1758,7 @@ extend_info_from_routerstatus(routerstatus_t *s)
   info->onion_key = NULL; /* routerstatus doesn't know this */
   info->addr = s->addr;
   info->port = s->or_port;
+  info->router_purpose = get_router_purpose_from_digest(info->identity_digest);
   return info;
 }