backport r17958

svn:r17961

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b1025548f..ee2dcc74b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@ Changes in version 0.2.0.33 - 2009-01-??
       get a recent networkstatus but would get descriptors from up to
       18 hours earlier, meaning most of the descriptors were obsolete
       already. Reported by Tas; bugfix on 0.2.0.13-alpha.
+    - Prevent bridge relays from serving their 'extrainfo' document
+      to anybody who asks, now that extrainfo docs include potentially
+      sensitive aggregated client geoip summaries. Bugfix on
+      0.2.0.13-alpha.
 
   o Minor bugfixes:
     - Do not mark smartlist_bsearch_idx() function as ATTR_PURE. This bug
diff --git a/src/or/directory.c b/src/or/directory.c
index d0671fccf1..05a219b241 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2468,7 +2468,9 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
   }
 
   if (!strcmpstart(url,"/tor/server/") ||
-      (!options->BridgeAuthoritativeDir && !strcmpstart(url,"/tor/extra/"))) {
+      (!options->BridgeAuthoritativeDir &&
+       !options->BridgeRelay &&
+       !strcmpstart(url,"/tor/extra/"))) {
     int res;
     const char *msg;
     const char *request_type = NULL;