Nick Mathewson 2ab3389ed6 Merge remote branch 'mikeperry/consensus-bw-weights5-merge' ...

Conflicts:
	ChangeLog

2010-02-25 16:22:29 -05:00

..

buffers.c

Merge branch 'safelogging2'

2009-12-15 17:26:09 -05:00

circuitbuild.c

Remove misc unnecessary newlines found by new check.

2010-02-22 16:52:11 -08:00

circuitlist.c

Remove some old, commented out code

2009-12-25 16:35:47 +01:00

circuituse.c

Be more willing to use an unsuitable circuit for exit.

2009-12-21 03:52:32 -05:00

command.c

Refactor the safe_str_*() API to make more sense.

2009-12-15 17:25:34 -05:00

config_codedigest.c

fix codestyle issues

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

config.c

Restrict PerConnBWRate|Burst to INT32_MAX, update manpage

2010-02-25 12:33:15 +01:00

connection_edge.c

Merge remote branch 'sebastian/bug1238'

2010-02-09 12:50:45 -05:00

connection_or.c

add config options to override.

2009-12-29 23:13:03 -05:00

connection.c

Don't spam controllers with TOO_MANY_CONNECTIONS events

2010-02-08 16:45:36 +01:00

control.c

Fix another coverity-spotted memleak

2010-02-23 15:05:39 +01:00

cpuworker.c

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

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

directory.c

Be quieter about failing to decode authority digests

2010-01-25 18:05:20 +01:00

dirserv.c

Call exit_policy_is_general_exit less

2010-02-04 00:06:56 +01:00

dirvote.c

Check snprintf return values in format_networkstatus_vote.

2010-02-25 11:59:35 -08:00

dns.c

Build correctly with Libevent 2.0.4-alpha and later

2010-02-15 16:47:47 -05:00

dnsserv.c

Make the DNSPort option work with libevent 2.x

2010-02-19 22:36:53 +01:00

eventdns_tor.h

Update copyright to 2009.

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

eventdns.c

Try to untangle the logic in server_port_flush

2010-01-25 14:09:58 -05:00

eventdns.h

Fix compile warnings on Snow Leopard

2009-09-01 18:36:27 +02:00

geoip.c

Fix a memory corruption bug while collecting bridge stats

2010-01-26 11:55:43 +01:00

hibernate.c

Fix/annotate deadcode for CID 402,403

2009-10-26 22:40:41 -04:00

main.c

Remove some old, commented out code

2009-12-25 16:35:47 +01:00

Makefile.am

Merge commit 'origin/maint-0.2.1'

2010-01-24 15:03:45 -05:00

microdesc.c

Fix a memory corruption bug while collecting bridge stats

2010-01-26 11:55:43 +01:00

networkstatus.c

Remove misc unnecessary newlines found by new check.

2010-02-22 16:52:11 -08:00

ntmain.c

Whitespace fix

2009-09-28 23:50:57 -04:00

onion.c

Fix bug 1042.

2009-10-26 22:49:43 -07:00

or.h

Implement bw weighting selection algorithm.

2010-02-22 16:52:11 -08:00

policies.c

Speed up the execution of exit_policy_is_general_exit_helper()

2010-02-09 09:10:07 +01:00

reasons.c

A changelog entry and a bit more documentation for socks-client

2009-08-26 11:34:45 -04:00

relay.c

Refactor the safe_str_*() API to make more sense.

2009-12-15 17:25:34 -05:00

rendclient.c

Merge commit 'origin/maint-0.2.1'

2010-02-07 22:34:08 -05:00

rendcommon.c

Proper NULL checking for hsdesc publication

2010-02-23 17:09:02 +01:00

rendmid.c

Refactor the safe_str_*() API to make more sense.

2009-12-15 17:25:34 -05:00

rendservice.c

Switch to a StrictNodes config option.

2009-12-21 03:52:31 -05:00

rephist.c

Always weight routers by bandwidth.

2010-02-22 16:52:11 -08:00

router.c

Fix a memory corruption bug while collecting bridge stats

2010-01-26 11:55:43 +01:00

routerlist.c

Always weight routers by bandwidth.

2010-02-22 16:52:11 -08:00

routerparse.c

Clearly mark directory footer so we parse the new weight line.

2010-02-22 16:52:11 -08:00

tor_main.c

Add the first 8 bytes of the git commit digest to our versions.

2009-08-21 12:31:13 -04:00