nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2011-03-08 15:20:48 -05:00
commit 9ad083d573
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug2629 Normal file
View File

@ -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".

3
src/or/circuitbuild.c
View File

@ -4728,7 +4728,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;
}