Nick Mathewson 9fba014e3f Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023 ...

Conflicts in various places, mainly node-related.  Resolved them in
favor of HEAD, with copying of tor_mem* operations from bug3122_memcmp_022.

	src/common/Makefile.am
	src/or/circuitlist.c
	src/or/connection_edge.c
	src/or/directory.c
	src/or/microdesc.c
	src/or/networkstatus.c
	src/or/router.c
	src/or/routerlist.c
	src/test/test_util.c

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

..

address.c

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

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

address.h

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

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

aes.c

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

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

aes.h

Bump copyright statements to 2011

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

ciphers.inc

fix a few typos, and give the bootstrap phase stuff a changelog entry.

2008-06-13 04:26:05 +00:00

compat_libevent.c

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

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

compat_libevent.h

Add a new option to enable/disable IOCP support

2010-09-28 14:01:45 -04:00

compat.c

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

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

compat.h

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

2011-04-28 17:15:31 -04:00

container.c

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

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

container.h

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

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

crypto.c

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

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

crypto.h

Make the DH parameter we use for TLS match the one from Apache's mod_ssl

2011-02-10 15:55:06 -05:00

di_ops.c

Add a data-independent variant of memcmp and a d-i memeq function.

2011-05-11 16:12:33 -04:00

di_ops.h

Hand-conversion and audit phase of memcmp transition

2011-05-11 16:12:51 -04:00

ht.h

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

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

log.c

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

2011-04-08 13:37:57 -04:00

Makefile.am

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

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

memarea.c

Comment out ancient asserts for bug 930; resolve an xxx021

2011-03-25 16:28:38 -04:00

memarea.h

Bump copyright statements to 2011

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

mempool.c

typos

2011-01-12 18:38:52 -05:00

mempool.h

Bump copyright statements to 2011

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

OpenBSD_malloc_Linux.c

Fix the rest of the GCC warnings on OpenBSD_malloc_linux.c

2008-07-06 18:33:35 +00:00

sha256.c

Bump copyright statements to 2011 (0.2.2)

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

strlcat.c

r8860@totoro: nickm | 2006-10-03 14:48:33 -0400

2006-10-03 19:00:07 +00:00

strlcpy.c

Remove svn $Id$s from our source, and remove tor --version --version.

2009-01-04 00:35:51 +00:00

torgzip.c

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

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

torgzip.h

Bump copyright statements to 2011

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

torint.h

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

2011-04-27 22:14:28 -04:00

torlog.h

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

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

tortls_states.h

Bump copyright statements to 2011 (0.2.2)

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

tortls.c

C style fix: a no-args function is void fn(void), not void fn().

2011-03-03 23:42:14 -05:00

tortls.h

Merge remote branch 'origin/maint-0.2.2'

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

util_codedigest.c

Include the *_sha1.i files in their own *_codedigest.c files.

2009-05-08 12:35:36 -04:00

util.c

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

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

util.h

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

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