Nick Mathewson 69f7c0385b Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased ...

There was a merge conflict in routerlist.c due to the new node_t logic.

Conflicts:
	src/or/routerlist.c

2011-02-04 12:26:59 -05:00

..

buffers.c

Fix another instance of "128" in buffers.c. More bug2330.

2011-01-15 10:25:58 -05:00

buffers.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

circuitbuild.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-26 11:08:02 -05:00

circuitbuild.h

Merge branch 'maint-0.2.2'

2011-01-15 22:39:15 -05:00

circuitlist.c

Merge branch 'maint-0.2.2'

2011-01-15 22:39:15 -05:00

circuitlist.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

circuituse.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

circuituse.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

command.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 12:00:59 -05:00

command.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

config_codedigest.c

…

config.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-25 14:30:01 -05:00

config.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

connection_edge.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-07 22:05:11 -05:00

connection_edge.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

connection_or.c

Merge branch 'maint-0.2.2'

2011-01-15 22:39:15 -05:00

connection_or.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

connection.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

connection.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

control.c

Fix wide lines in control.c

2011-01-07 12:16:12 -05:00

control.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

cpuworker.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 12:47:58 -05:00

cpuworker.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

directory.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

directory.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

dirserv.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

dirserv.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

dirvote.c

Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased

2011-02-04 12:26:59 -05:00

dirvote.h

Merge branch 'maint-0.2.2'

2011-01-15 22:39:15 -05:00

dns.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-12 14:00:56 -05:00

dns.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

dnsserv.c

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

2011-01-15 13:10:14 -05:00

dnsserv.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

eventdns_tor.h

Bump copyright statements to 2011

2011-01-03 11:50:39 -05:00

eventdns.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 12:47:58 -05:00

eventdns.h

…

geoip.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-25 15:58:01 -05:00

geoip.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

hibernate.c

Log more about soft-hibernation

2011-01-25 18:45:13 -05:00

hibernate.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

main.c

Merge remote branch 'origin/maint-0.2.2'

2011-02-03 14:21:14 -05:00

main.h

GETINFO options for querying traffic usage

2011-01-07 12:15:14 -05:00

Makefile.am

Split long lines in configure.in and Makefile.am files

2010-11-11 14:22:48 -05:00

microdesc.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

microdesc.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

networkstatus.c

Merge branch 'maint-0.2.2'

2011-01-15 22:39:15 -05:00

networkstatus.h

Merge branch 'maint-0.2.2'

2011-01-15 22:39:15 -05:00

nodelist.c

Bump copyright statements to 2011 (master)

2011-01-03 11:55:01 -05:00

nodelist.h

Bump copyright statements to 2011 (master)

2011-01-03 11:55:01 -05:00

ntmain.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 12:47:58 -05:00

ntmain.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

onion.c

Handle failing cases of DH allocation

2011-01-25 18:09:38 -05:00

onion.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

or.h

Merge branch 'maint-0.2.2'

2011-01-15 22:39:15 -05:00

policies.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-20 15:00:42 -05:00

policies.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

reasons.c

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

2011-01-03 11:51:17 -05:00

reasons.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

relay.c

Merge branch 'maint-0.2.2'

2011-01-15 22:39:15 -05:00

relay.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

rendclient.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-24 17:51:52 -05:00

rendclient.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

rendcommon.c

Fix a heap overflow found by debuger, and make it harder to make that mistake again

2011-01-15 11:49:25 -05:00

rendcommon.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

rendmid.c

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

2011-01-03 11:58:59 -05:00

rendmid.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

rendservice.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-24 17:51:52 -05:00

rendservice.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

rephist.c

Add a note about _compare_int not doing overflow right

2011-01-03 12:03:21 -05:00

rephist.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

router.c

Merge branch 'maint-0.2.2'

2011-01-15 22:39:15 -05:00

router.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

routerlist.c

Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased

2011-02-04 12:26:59 -05:00

routerlist.h

Merge remote branch 'origin/maint-0.2.2'

2011-01-03 11:53:28 -05:00

routerparse.c

Merge remote branch 'origin/maint-0.2.2'

2011-01-26 11:08:02 -05:00

routerparse.h

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

tor_main.c

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

2011-01-03 11:51:17 -05:00