Nick Mathewson df354a002c Merge commit 'origin/maint-0.2.1' ...

Resolved onflicts in:
	ChangeLog
	src/or/config.c
	src/or/or.h

2009-07-30 10:16:04 -04:00

..

buffers.c

fix comments and other typos

2009-07-13 17:34:46 -04:00

circuitbuild.c

Merge commit 'origin/maint-0.2.1'

2009-05-31 19:17:22 -04:00

circuitlist.c

If configured, write cell statistics to disk periodically.

2009-07-05 19:53:25 +02:00

circuituse.c

Merge commit 'origin/maint-0.2.1'

2009-05-28 16:07:49 -04:00

command.c

three hacks to workaround bug 1038

2009-07-27 21:58:32 -04:00

config_codedigest.c

fix codestyle issues

2009-05-24 02:42:37 +02:00

config.c

Merge commit 'origin/maint-0.2.1'

2009-07-30 10:16:04 -04:00

connection_edge.c

Some tweaks to statistics.

2009-07-15 16:32:40 +02:00

connection_or.c

Isolate Libevent API dependency to just main.c and dns.c in src/or.

2009-06-12 14:27:53 -04:00

connection.c

Some tweaks to statistics.

2009-07-15 16:32:40 +02:00

control.c

remove experimental 'getinfo unregistered-servers-'

2009-07-13 17:34:47 -04:00

cpuworker.c

Don't leak memory if we get too many create cells

2009-07-27 22:38:09 -04:00

directory.c

Some tweaks to statistics.

2009-07-15 16:32:40 +02:00

dirserv.c

remove experimental 'getinfo unregistered-servers-'

2009-07-13 17:34:47 -04:00

dirvote.c

fix comments and other typos

2009-07-13 17:34:46 -04:00

dns.c

fix comments and other typos

2009-07-13 17:34:46 -04:00

dnsserv.c

Update Tor to use Libevent 2.0 APIs when available.

2009-06-12 14:27:52 -04:00

eventdns_tor.h

Update copyright to 2009.

2009-05-04 11:28:27 -04:00

eventdns.c

Merge commit 'origin/maint-0.2.1'

2009-06-30 10:13:51 -04:00

eventdns.h

Port some mostly cosmetic eventdns changes from libevent

2009-02-11 17:22:29 +00:00

geoip.c

Fix dirreq and cell stats on 32-bit architectures.

2009-07-27 16:23:53 +02:00

hibernate.c

Spell-check Tor.

2009-05-27 17:55:51 -04:00

main.c

If configured, write cell statistics to disk periodically.

2009-07-05 19:53:25 +02:00

Makefile.am

Update Tor to use Libevent 2.0 APIs when available.

2009-06-12 14:27:52 -04:00

networkstatus.c

Merge commit 'ioerror/DirFetchInfoExtraEarly'

2009-07-25 00:52:54 -04:00

ntmain.c

Spell-check Tor.

2009-05-27 17:55:51 -04:00

onion.c

Spell-check Tor.

2009-05-27 17:55:51 -04:00

or.h

Merge commit 'origin/maint-0.2.1'

2009-07-30 10:16:04 -04:00

policies.c

Avoid a memory corruption problem related to "private" in DirPolicy.

2009-06-05 19:41:40 -04:00

reasons.c

Update copyright to 2009.

2009-05-04 11:28:27 -04:00

relay.c

Merge branch 'maint-0.2.1' into master

2009-07-28 18:19:57 -04:00

rendclient.c

Merge commit 'origin/maint-0.2.1'

2009-07-02 10:20:20 -04:00

rendcommon.c

Revert "Backport fix for bug 997."

2009-06-19 15:46:13 +02:00

rendmid.c

Update copyright to 2009.

2009-05-04 11:28:27 -04:00

rendservice.c

Merge commit 'origin/maint-0.2.1'

2009-05-27 18:12:18 -04:00

rephist.c

Make exit stats compile on 64-bit machines, too.

2009-07-18 10:35:20 -04:00

router.c

Merge branch 'maint-0.2.1' into master

2009-07-28 18:19:57 -04:00

routerlist.c

the second piece of bug 969 fixing

2009-06-30 10:10:13 -04:00

routerparse.c

Spell-check Tor.

2009-05-27 17:55:51 -04:00

test_data.c

Update copyright to 2009.

2009-05-04 11:28:27 -04:00

test.c

Fix unit tests.

2009-07-24 01:13:33 +02:00

tor_main.c

Update copyright to 2009.

2009-05-04 11:28:27 -04:00