diff --git a/changes/bug2629 b/changes/bug2629
new file mode 100644
index 0000000000..87817cf6e3
--- /dev/null
+++ b/changes/bug2629
@@ -0,0 +1,5 @@
+  o Minor bugfixes
+    - Fix a crash bug that could occur occasionally when a client was
+      configured with a large number of bridges.  Fixes bug 2629; bugfix
+      on 0.2.1.2-alpha.  Bugfix by trac user "shitlei".
+
diff --git a/doc/HACKING b/doc/HACKING
index 486fe6d10a..bdb86c06c6 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -312,11 +312,11 @@ operation.
 If a library function is currently called such that failure always means ERR,
 then the library function should log WARN and let the caller log ERR.
 
-[XXX Proposed convention: every message of severity INFO or higher should
-either (A) be intelligible to end-users who don't know the Tor source; or (B)
-somehow inform the end-users that they aren't expected to understand the
-message (perhaps with a string like "internal error").  Option (A) is to be
-preferred to option (B). -NM]
+Every message of severity INFO or higher should either (A) be intelligible
+to end-users who don't know the Tor source; or (B) somehow inform the
+end-users that they aren't expected to understand the message (perhaps
+with a string like "internal error"). Option (A) is to be preferred to
+option (B).
 
 Doxygen
 ~~~~~~~~
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index cfc6b0d350..7ad3b07500 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -4748,7 +4748,8 @@ any_pending_bridge_descriptor_fetches(void)
         conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC &&
         TO_DIR_CONN(conn)->router_purpose == ROUTER_PURPOSE_BRIDGE &&
         !conn->marked_for_close &&
-        conn->linked && !conn->linked_conn->marked_for_close) {
+        conn->linked &&
+        conn->linked_conn && !conn->linked_conn->marked_for_close) {
       log_debug(LD_DIR, "found one: %s", conn->address);
       return 1;
     }