Merge branch 'maint-0.2.2'

changes/bug4124

@@ -0,0 +1,6 @@
+  o Security fixes:
+    - Bridges relays now build circuits for themselves in a more similar
+      way to how clients build them. Removes another avenue for
+      enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha,
+      when bridges were introduced.
+

src/or/circuitbuild.c

@@ -1982,9 +1982,10 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ)
     return 1; /* our hand is forced: only a create_fast will work. */
   if (!options->FastFirstHopPK)
     return 0; /* we prefer to avoid create_fast */
-  if (server_mode(options)) {
+  if (public_server_mode(options)) {
     /* We're a server, and we know an onion key. We can choose.
-     * Prefer to blend in. */
+     * Prefer to blend our circuit into the other circuits we are
+     * creating on behalf of others. */
     return 0;
   }