Nick Mathewson ed87738ede Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 ...

Conflicts:
	src/or/config.c
	src/or/networkstatus.c
	src/or/rendcommon.c
	src/or/routerparse.c
	src/or/test.c

2011-01-15 12:02:55 -05:00

..

address.c

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

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

address.h

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

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

aes.c

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

2011-01-03 11:51:17 -05: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

Bump copyright statements to 2011 (0.2.2)

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

compat_libevent.h

Use Libevent 2.0's periodic timers where available.

2010-06-25 15:31:46 -04:00

compat.c

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

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

compat.h

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

2011-01-03 13:18:33 -05:00

container.c

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

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

container.h

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

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

crypto.c

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

2011-01-15 12:02:55 -05:00

crypto.h

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

2011-01-15 12:02:55 -05: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 branch 'origin/maint-0.2.1' into maint-0.2.2

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

Makefile.am

Rename log.h to torlog.h

2010-07-09 22:05:38 -04:00

memarea.c

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

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

memarea.h

Bump copyright statements to 2011

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

mempool.c

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

2011-01-03 11:51:17 -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 branch 'origin/maint-0.2.1' into maint-0.2.2

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

torgzip.h

Bump copyright statements to 2011

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

torint.h

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

2011-01-12 14:38:11 -05:00

torlog.h

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

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

tortls_states.h

Bump copyright statements to 2011 (0.2.2)

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

tortls.c

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

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

tortls.h

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

2011-01-03 11:51:17 -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 branch 'origin/maint-0.2.1' into maint-0.2.2

2011-01-03 15:31:19 -05:00

util.h

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

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