Roger Dingledine 18f1b354ec Merge branch 'maint-0.2.2'

2011-05-17 21:15:24 -04:00

..

buffers.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-04-07 12:17:20 -04:00

buffers.h

…

circuitbuild.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-17 19:47:48 -04:00

circuitbuild.h

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-15 20:17:17 -04:00

circuitlist.c

Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023

2011-05-11 16:39:45 -04:00

circuitlist.h

Add a circuit_purpose_to_string() function, and use it

2011-04-27 00:01:35 -04:00

circuituse.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-15 11:44:51 -04:00

circuituse.h

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-15 11:44:51 -04:00

command.c

…

command.h

…

config_codedigest.c

…

config.c

Merge branch 'maint-0.2.2'

2011-05-17 21:15:24 -04:00

config.h

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-04-28 20:55:03 -04:00

connection_edge.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-15 11:44:51 -04:00

connection_edge.h

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-15 11:44:51 -04:00

connection_or.c

Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023

2011-05-11 16:39:45 -04:00

connection_or.h

…

connection.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-17 19:53:06 -04:00

connection.h

…

control.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-13 10:48:07 -04:00

control.h

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-13 10:48:07 -04:00

cpuworker.c

…

cpuworker.h

…

directory.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-16 14:50:53 -04:00

directory.h

Code to make clients fetch and use microdescriptors for circuit building

2011-05-05 20:54:12 -04:00

dirserv.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-13 10:48:07 -04:00

dirserv.h

make make check-spaces happier.

2011-04-27 15:18:34 -04:00

dirvote.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-15 20:12:20 -04:00

dirvote.h

…

dns.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-04-07 12:17:20 -04:00

dns.h

…

dnsserv.c

Merge remote-tracking branch 'public/bug2332' into maint-0.2.2

2011-04-26 13:10:54 -04:00

dnsserv.h

…

eventdns_tor.h

…

eventdns.c

Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023

2011-05-11 16:39:45 -04:00

eventdns.h

…

geoip.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-04-07 12:17:20 -04:00

geoip.h

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-04-07 11:55:17 -04:00

hibernate.c

Correctly check elapsed time in last hibernation period

2011-04-29 01:18:32 +02:00

hibernate.h

…

main.c

Merge branch 'maint-0.2.2'

2011-05-17 20:50:18 -04:00

main.h

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-04-26 15:30:51 -04:00

Makefile.am

Link to libevent_openssl statically when requested

2011-05-06 15:38:32 +02:00

microdesc.c

Merge remote-tracking branch 'public/bug3122_memcmp_023'

2011-05-12 19:27:18 -04:00

microdesc.h

Code to make clients fetch and use microdescriptors for circuit building

2011-05-05 20:54:12 -04:00

networkstatus.c

Fixup whitespace issues from 3122 commit

2011-05-15 20:06:36 -04:00

networkstatus.h

…

nodelist.c

Hand-tune the new tor_memcmp instances in 0.2.3

2011-05-11 16:46:38 -04:00

nodelist.h

…

ntmain.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-03-16 17:09:32 -04:00

ntmain.h

…

onion.c

Merge remote-tracking branch 'public/3122_memcmp_squashed' into bug3122_memcmp_022

2011-05-11 16:24:29 -04:00

onion.h

…

or.h

Check fetched rendezvous descriptors' service IDs

2011-05-16 14:07:24 -04:00

policies.c

…

policies.h

…

reasons.c

Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete

2011-03-28 13:42:59 -04:00

reasons.h

…

relay.c

Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023

2011-05-11 16:39:45 -04:00

relay.h

Move the decl for tor_gettimofday_cache_clear to the right header

2011-03-16 17:54:48 -04:00

rendclient.c

Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023

2011-05-11 16:39:45 -04:00

rendclient.h

Merge branch 'bug3k_021' into bug3k_022

2011-04-28 19:00:34 +02:00

rendcommon.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-16 14:50:53 -04:00

rendcommon.h

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-16 14:50:53 -04:00

rendmid.c

Merge remote-tracking branch 'public/3122_memcmp_squashed' into bug3122_memcmp_022

2011-05-11 16:24:29 -04:00

rendmid.h

…

rendservice.c

Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023

2011-05-11 16:39:45 -04:00

rendservice.h

…

rephist.c

Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023

2011-05-11 16:39:45 -04:00

rephist.h

…

router.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-13 10:48:07 -04:00

router.h

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-13 10:48:07 -04:00

routerlist.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-15 20:12:20 -04:00

routerlist.h

Move dummy authority.z fetch out of update_router_descriptor_downloads

2011-05-05 20:54:13 -04:00

routerparse.c

Merge remote-tracking branch 'origin/maint-0.2.2'

2011-05-17 19:47:48 -04:00

routerparse.h

Move the decl for tor_gettimofday_cache_clear to the right header

2011-03-16 17:54:48 -04:00

status.c

Fix bug3183

2011-05-15 03:13:52 +02:00

status.h

…

tor_main.c

…