Nick Mathewson a28df3fb67 Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold' ...

Conflicts:
	src/or/or.h
	src/test/Makefile.nmake

2014-11-27 22:39:46 -05:00

..

address.c

Merge remote-tracking branch 'public/bug7484'

2014-11-12 13:44:57 -05:00

address.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

aes.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

aes.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

backtrace.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

backtrace.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

ciphers.inc

Update ciphers.inc to match ff28

2014-04-08 11:42:07 -04:00

compat_libevent.c

Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'

2014-11-27 22:39:46 -05:00

compat_libevent.h

Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'

2014-11-27 22:39:46 -05:00

compat.c

Apply new calloc coccinelle patch

2014-11-02 11:56:02 -05:00

compat.h

Define macros meaning <,>,==,!=,<=,>=

2014-11-06 11:21:13 -05:00

container.c

Refactor {str,digest}map into a common implementation; add digest256map

2014-10-31 10:54:12 -04:00

container.h

Refactor {str,digest}map into a common implementation; add digest256map

2014-10-31 10:54:12 -04:00

crypto_curve25519.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

crypto_curve25519.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

crypto_ed25519.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

crypto_ed25519.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

crypto_format.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

crypto_pwbox.c

Silence spurious clang warnings

2014-10-30 22:34:46 +11:00

crypto_pwbox.h

Rudimentary-but-sufficient passphrase-encrypted box code.

2014-09-25 11:58:13 -04:00

crypto_s2k.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

crypto_s2k.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

crypto.c

Downgrade RSA signature verification failure error message to info loglevel.

2014-11-09 17:39:23 +02:00

crypto.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

di_ops.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

di_ops.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

include.am

Remove configure option to disable curve25519

2014-10-27 14:41:19 +01:00

linux_syscalls.inc

Move code-generation scripts to scripts/codegen

2014-05-07 01:17:41 -04:00

log.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

Makefile.nmake

Clean up the MVSC nmake files so they work again.

2014-09-09 10:27:05 -04:00

memarea.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

memarea.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

mempool.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

mempool.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

procmon.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

procmon.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

sandbox.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

sandbox.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

testsupport.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

torgzip.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

torgzip.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

torint.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

torlog.h

Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'

2014-11-27 22:39:46 -05:00

tortls.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

tortls.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

util_codedigest.c

Resolve about 24 DOCDOCs

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

util_process.c

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

util_process.h

Add another year to our copyright dates.

2014-10-28 15:30:16 -04:00

util.c

11291: Fix warnings, add changes file, rename 'mask'.

2014-11-05 14:12:18 -05:00

util.h

Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'

2014-11-05 14:11:47 -05:00