Nick Mathewson af7fab020a Merge remote branch 'origin/maint-0.2.2' ...

Conflicts:
	src/or/config.c

2010-09-27 17:52:20 -04:00

..

autoreconf

Use autoreconf, not autoconf&&automake&&etc in autogen.sh

2010-09-27 11:20:12 -04:00

bufferevent-support

Add a changes file for bufferevents

2010-09-27 14:22:18 -04:00

bug1362

log when we finish a circuit after being offline

2010-09-21 02:16:43 -04:00

bug1511

Tolerate a little skew in accounting intervals.

2010-09-03 12:19:17 -04:00

bug1751

the actual changelog entry this time

2010-09-27 17:44:51 -04:00

bug1789

Bug1789 cleanups suggested by arma

2010-09-21 14:02:04 -04:00

bug1805

Kill warn when picking bridges without bw weight

2010-09-06 18:44:11 +02:00

bug1943

changelog entry for bug 1943

2010-09-20 21:32:18 -04:00

bug1952

Add changelog for bug 1952.

2010-09-27 09:12:00 -07:00

bug1954_loadlib

Use load_windows_system_library in place of LoadLibrary

2010-09-21 14:40:10 -04:00

bug1956

Count unknown authorities as unknown only once, not once per signature.

2010-09-20 13:33:57 -04:00

bug1964

Fix a bridge segfault

2010-09-27 23:19:25 +02:00

torrc_continuation

Tweak continuation-and-comment logic

2010-09-23 22:58:04 -04:00

win_build_fix

Attempt to fix compilation on Windows

2010-09-19 13:39:30 +02:00