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

Fixed trivial conflict due to headers moving into their own .h files
from or.h.

Conflicts:
	src/or/or.h

2011-05-16 14:49:55 -04:00

..

address.c

Add a new "tor_sockaddr_to_str()" function

2011-05-13 10:41:18 -04:00

address.h

Add a new "tor_sockaddr_to_str()" function

2011-05-13 10:41:18 -04:00

aes.c

Doxygen documentation for about 100 things that didn't have any

2011-03-16 17:05:37 -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

Clean up a comment-conversation about bad libevent version/method combos

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

compat_libevent.h

Use Libevent 2.0's periodic timers where available.

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

compat.c

Fix up some comment issues spotted by rransom

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

compat.h

Add a function to pull off the final component of a path

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

container.c

Increase the length of the buffer in smartlist_string_num_isin().

2011-05-15 22:13:53 -04:00

container.h

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

2011-05-15 20:09:10 -04:00

crypto.c

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

2011-05-16 14:49:55 -04:00

crypto.h

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

2011-05-16 14:49:55 -04:00

di_ops.c

Another doc tweak on tor_memcmp: <b>b</b>, not <b>.

2011-05-15 19:56:05 -04:00

di_ops.h

Fixup whitespace issues from 3122 commit

2011-05-15 20:06:36 -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

Free pending_cb_messages on exit

2011-04-07 15:25:33 -04:00

Makefile.am

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

2011-05-11 16:24:29 -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

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-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

Doxygen documentation for about 100 things that didn't have any

2011-03-16 17:05:37 -04:00

tortls_states.h

Bump copyright statements to 2011 (0.2.2)

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

tortls.c

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

2011-02-10 15:55:06 -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

Make check_private_dir check for group ownership as appropriate

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

util.h

Add a new flag to check_private_dir to make it _not_ change permissions

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