Nick Mathewson 0e207f9acb Merge remote-tracking branch 'public/close_file_mapping' ...

Conflicts:
	src/common/compat.h

Conflict was between replacement of MS_WINDOWS with _WIN32 in
master, and with removal of file_handle from tor_mmap_t struct in
close_file_mapping branch (for bug 5951 fix).

2012-05-31 12:38:11 -04:00

..

address.c

Merge remote-tracking branch 'public/bug2822'

2012-05-16 11:10:09 -04:00

address.h

Merge remote-tracking branch 'public/bug2822'

2012-05-16 11:10:09 -04:00

aes.c

Bump _WIN32_WINNT to 0x0501 throughout the code

2012-05-14 13:46:37 -04:00

aes.h

Refactor the API for setting up a block cipher.

2012-03-27 22:37:56 -04: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

Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32

2012-01-31 15:48:47 -05:00

compat_libevent.h

Revert "Use callback-driven approach to block renegotiations."

2011-12-06 19:49:20 -05:00

compat.c

Merge remote-tracking branch 'public/close_file_mapping'

2012-05-31 12:38:11 -04:00

compat.h

Merge remote-tracking branch 'public/close_file_mapping'

2012-05-31 12:38:11 -04:00

container.c

Port over the last ht.h changes from libevent: avoid _reserved identifiers

2012-02-13 18:40:30 -05:00

container.h

Rename nonconformant identifiers.

2012-01-18 15:53:30 -05:00

crypto.c

Fix clang 3.1 compile warning in crypto.c

2012-05-30 11:56:43 -04:00

crypto.h

Excise PK_NO_PADDING entirely: Unpadded RSA is silly.

2012-03-27 22:38:06 -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

Make ht.h conform to Tor's code style again

2012-02-14 11:13:06 +01:00

log.c

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

2012-05-31 00:07:52 -04:00

Makefile.am

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

2012-02-12 23:27:31 -05:00

Makefile.nmake

Be a good git person: store nmakefiles in correct text fmt

2012-05-14 13:01:05 -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

Remove some duplicate includes

2011-11-03 10:23:33 -04:00

mempool.h

Bump copyright statements to 2011

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

OpenBSD_malloc_Linux.c

Fix compile warnings in openbsd malloc

2012-03-08 19:28:59 +01:00

procmon.c

Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32

2012-01-31 15:48:47 -05:00

procmon.h

Appease make check-spaces wrt procmon.h

2011-05-23 01:10:49 -04: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

Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.

2011-10-26 07:30:11 -04:00

torgzip.h

Bump copyright statements to 2011

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

torint.h

Actually pick a random port when "auto" is specified

2011-08-17 10:41:36 -04:00

torlog.h

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

2011-05-23 01:23:53 -04:00

tortls.c

Bump _WIN32_WINNT to 0x0501 throughout the code

2012-05-14 13:46:37 -04:00

tortls.h

Rename nonconformant identifiers.

2012-01-18 15:53:30 -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 'origin/maint-0.2.2'

2012-05-16 12:20:56 -04:00

util.h

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

2012-05-31 00:07:52 -04:00