Nick Mathewson 7a2b30fe16 Merge remote-tracking branch 'origin/maint-0.2.4' ...

Conflicts:
	src/or/relay.c

Conflict changes were easy; compilation fixes required were using
using TOR_SIMPLEQ_FIRST to get head of cell queue.

2013-11-15 15:35:00 -05:00

..

address.c

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

2013-10-08 16:47:49 -04:00

address.h

Remove the unused addr_mask_cmp_bits

2013-03-01 14:46:34 -05:00

aes.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

aes.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

ciphers.inc

Change our ciphersuite list to match ff8

2012-05-15 15:25:54 -04:00

compat_libevent.c

Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384.

2013-09-01 17:38:01 +01:00

compat_libevent.h

Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384.

2013-09-01 17:38:01 +01:00

compat.c

Merge remote-tracking branch 'ctoader/gsoc-cap-stage2'

2013-09-13 12:31:41 -04:00

compat.h

Split the socketpair replacement code into its own function for testing

2013-08-02 10:36:01 -04:00

container.c

Tweak #6752 patch based on comments by nickm.

2013-05-24 10:28:31 +02:00

container.h

Lower dir fetch retry schedules in testing networks.

2013-05-16 12:08:48 +02:00

crypto_curve25519.c

Completely refactor how FILENAME_PRIVATE works

2013-07-10 15:20:10 -04:00

crypto_curve25519.h

Completely refactor how FILENAME_PRIVATE works

2013-07-10 15:20:10 -04:00

crypto_format.c

Completely refactor how FILENAME_PRIVATE works

2013-07-10 15:20:10 -04:00

crypto.c

Merge remote-tracking branch 'Ryman/bug6384'

2013-09-13 12:55:53 -04:00

crypto.h

Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384.

2013-09-01 17:38:01 +01:00

di_ops.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

di_ops.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

get_mozilla_ciphers.py

Change our ciphersuite list to match ff8

2012-05-15 15:25:54 -04:00

include.am

Merge remote-tracking branch 'public/fancy_test_tricks'

2013-07-15 12:02:18 -04:00

log.c

Merge remote-tracking branch 'public/fancy_test_tricks'

2013-07-15 12:02:18 -04:00

Makefile.nmake

Add ntor-related modules to the Makefiles.nmake

2013-01-17 15:53:36 -05:00

memarea.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

memarea.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

mempool.c

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

mempool.h

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2013-06-18 10:23:03 -04:00

procmon.c

Rename log() to tor_log() for logging

2013-02-01 15:43:37 -05:00

procmon.h

Update the copyright date to 201.

2013-01-16 01:54:56 -05:00

sandbox.c

Fix a memory leak on getaddrinfo in sandbox. Found by coverity

2013-09-16 22:38:02 -04:00

sandbox.h

Fix osx compilation again, hopefully better this time.

2013-09-11 13:53:33 -04:00

testsupport.h

Add rudimentary test mocking support.

2013-07-10 15:22:16 -04:00

torgzip.c

Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384.

2013-09-01 17:38:01 +01:00

torgzip.h

Added --library-versions flag to print the compile time and runtime versions of libevent, openssl and zlib. Partially implements #6384.

2013-09-01 17:38:01 +01:00

torint.h

Merge branch '024_msvc_squashed'

2013-01-16 22:32:12 -05:00

torlog.h

Merge remote-tracking branch 'public/fancy_test_tricks'

2013-07-15 12:02:18 -04:00

tortls.c

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

2013-10-31 14:03:01 -04:00

tortls.h

Fix #9043 - simplyfy the code and use EVP_PKEY_cmp instead of pkey_eq / tor_tls_evp_pkey_eq

2013-06-12 13:02:06 -04:00

util_codedigest.c

Resolve about 24 DOCDOCs

2012-06-05 00:17:54 -04:00

util.c

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

2013-11-15 15:35:00 -05:00

util.h

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

2013-11-15 15:35:00 -05:00