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

Merge commit 'origin/maint-0.2.1'

Browse Source
This commit is contained in:
Nick Mathewson 2009-05-22 11:56:51 -04:00
commit 4201a3735f
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -17,6 +17,11 @@ Changes in version 0.2.2.1-alpha - 2009-??-??
Changes in version 0.2.1.15??? - ????-??-?? Changes in version 0.2.1.15??? - ????-??-??
o Major bugfixes:
- Fix a timing-dependent, allocator-dependent, DNS-related crash bug
that would occur on some exit nodes when DNS failures and timeouts
occurred in certain patterns. Fix for bug 957.
o Minor bugfixes: o Minor bugfixes:
- Actually return -1 in the error case for read_bandwidth_usage(). - Actually return -1 in the error case for read_bandwidth_usage().
Harmless bug, since we currently don't care about the return value Harmless bug, since we currently don't care about the return value
@ -43,8 +48,6 @@ Changes in version 0.2.1.15??? - ????-??-??
descriptor as never-downloadable. Bugfix on 0.2.1.9-alpha. descriptor as never-downloadable. Bugfix on 0.2.1.9-alpha.
- Fix a memory leak when v3 directory authorities load their keys - Fix a memory leak when v3 directory authorities load their keys
and cert from disk. Bugfix on 0.2.0.1-alpha. and cert from disk. Bugfix on 0.2.0.1-alpha.
- Add a test and fix for a possible cause of bug 957. If it's
the real cause, it should display some warning messages.
Changes in version 0.2.1.14-rc - 2009-04-12 Changes in version 0.2.1.14-rc - 2009-04-12

2
src/or/config.c
View File

@ -1209,7 +1209,7 @@ options_need_geoip_info(or_options_t *options, const char **reason_out)
if (routerset_usage && reason_out) { if (routerset_usage && reason_out) {
*reason_out = "We've been configured to use (or avoid) nodes in certain " *reason_out = "We've been configured to use (or avoid) nodes in certain "
"contries, and we need GEOIP information to figure out which ones they " "countries, and we need GEOIP information to figure out which ones they "
"are."; "are.";
} else if (bridge_usage && reason_out) { } else if (bridge_usage && reason_out) {
*reason_out = "We've been configured to see which countries can access " *reason_out = "We've been configured to see which countries can access "

14
src/or/eventdns.c
View File

@ -474,7 +474,7 @@ sockaddr_eq(const struct sockaddr *sa1, const struct sockaddr *sa2,
return 1; return 1;
} }
/* for debugging bug 929. XXXX021 */ /* for debugging bug 929. XXXX022 */
static int static int
_add_timeout_event(u16 *lineno, struct event *ev, struct timeval *to) _add_timeout_event(u16 *lineno, struct event *ev, struct timeval *to)
{ {
@ -484,13 +484,13 @@ _add_timeout_event(u16 *lineno, struct event *ev, struct timeval *to)
#define add_timeout_event(s, to) \ #define add_timeout_event(s, to) \
(_add_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, (to))) (_add_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, (to)))
/* for debugging bug 929. XXXX021 */ /* for debugging bug 929. XXXX022 */
static int static int
_del_timeout_event(u16 *lineno, struct event *ev, int line) _del_timeout_event(u16 *lineno, struct event *ev, int line)
{ {
if (*lineno) { if (*lineno) {
log(EVDNS_LOG_WARN, log(EVDNS_LOG_DEBUG,
"BUG: Duplicate timeout event_del from line %d: first call " "Duplicate timeout event_del from line %d: first call "
"was at %d.", line, (int)*lineno); "was at %d.", line, (int)*lineno);
return 0; return 0;
} else { } else {
@ -501,13 +501,13 @@ _del_timeout_event(u16 *lineno, struct event *ev, int line)
#define del_timeout_event(s) \ #define del_timeout_event(s) \
(_del_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, \ (_del_timeout_event(&(s)->timeout_event_deleted, &(s)->timeout_event, \
__LINE__)) __LINE__))
/* For debugging bug 929/957. XXXX021 */ /* For debugging bug 929/957. XXXX022 */
static int static int
_del_timeout_event_if_set(u16 *lineno, struct event *ev, int line) _del_timeout_event_if_set(u16 *lineno, struct event *ev, int line)
{ {
if (*lineno == 0) { if (*lineno == 0) {
log(EVDNS_LOG_WARN, log(EVDNS_LOG_DEBUG,
"BUG: Event that I thought was non-added as of line %d " "Event that I thought was non-added as of line %d "
"was actually added on line %d", "was actually added on line %d",
line, (int)*lineno); line, (int)*lineno);
*lineno = line; *lineno = line;