teor (Tim Wilson-Brown) c4cb4706c9 Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged ...

Conflicts:
	src/or/directory.c
	src/test/test_routerlist.c

Fix minor conflicts.

2016-01-29 07:37:06 +11:00

..

address.c

Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged

2016-01-29 07:37:06 +11:00

address.h

Merge branch 'feature17840-v11-squashed' into feature17840-v11-merged

2016-01-29 07:37:06 +11:00

aes.c

Replace usage of INLINE with inline

2015-12-15 11:34:00 -05:00

aes.h

Bump copyright dates to 2015, in case someday this matters.

2015-01-02 14:27:39 -05:00

backtrace.c

Remove an extra space in backtrace version string

2015-12-18 13:09:05 -05:00

backtrace.h

Fix backtrace compilation on FreeBSD

2015-12-15 11:52:00 -05:00

ciphers.inc

Update ciphers.inc to match ff28

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

compat_libevent.c

Clean up compat_libevent tests

2015-10-02 13:13:58 +02:00

compat_libevent.h

Clean up compat_libevent tests

2015-10-02 13:13:58 +02:00

compat_openssl.h

Try a little harder to only use SecureZeroMemory when it's present

2016-01-11 09:02:42 -05:00

compat_pthreads.c

Don't call pthread_condattr_setclock() unless it exists

2015-12-16 09:23:44 -05:00

compat_threads.c

Check for EINTR correctly on windows

2015-08-07 09:12:33 -04:00

compat_threads.h

Improve threadlocal documentation

2015-08-18 08:56:24 -04:00

compat_winthreads.c

Merge branch 'decouple_controller_events_squashed'

2015-08-18 08:56:31 -04:00

compat.c

Add tests for options_act

2016-01-13 10:31:13 -05:00

compat.h

Whitespace cleanup

2016-01-15 10:57:03 -05:00

container.c

Replace usage of INLINE with inline

2015-12-15 11:34:00 -05:00

container.h

Replace usage of INLINE with inline

2015-12-15 11:34:00 -05:00

crypto_curve25519.c

Always hash crypto_strongest_rand() along with some prng

2015-12-08 10:54:42 -05:00

crypto_curve25519.h

Move formatting functions around.

2015-07-31 11:21:34 -04:00

crypto_ed25519.c

Always test both ed25519 backends.

2015-12-23 09:16:26 -05:00

crypto_ed25519.h

Always test both ed25519 backends.

2015-12-23 09:16:26 -05:00

crypto_format.c

Move formatting functions around.

2015-07-31 11:21:34 -04:00

crypto_format.h

Move formatting functions around.

2015-07-31 11:21:34 -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

Bump copyright dates to 2015, in case someday this matters.

2015-01-02 14:27:39 -05:00

crypto_s2k.h

Bump copyright dates to 2015, in case someday this matters.

2015-01-02 14:27:39 -05:00

crypto.c

Merge branch 'maint-0.2.7'

2016-01-19 08:30:48 -05:00

crypto.h

Merge remote-tracking branch 'public/feature16794_more'

2016-01-08 14:54:51 -08:00

di_ops.c

Use timingsafe_memcmp() where available.

2015-12-29 09:43:01 -05:00

di_ops.h

Bump copyright dates to 2015, in case someday this matters.

2015-01-02 14:27:39 -05:00

include.am

Simplify micro-revision dependency rules

2016-01-08 13:27:36 -08:00

linux_syscalls.inc

Move code-generation scripts to scripts/codegen

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

log.c

Whitespace cleanup

2016-01-15 10:57:03 -05:00

Makefile.nmake

Clean up the MVSC nmake files so they work again.

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

memarea.c

Replace usage of INLINE with inline

2015-12-15 11:34:00 -05:00

memarea.h

Bump copyright dates to 2015, in case someday this matters.

2015-01-02 14:27:39 -05:00

procmon.c

Fix "make check-spaces"

2015-10-07 09:34:02 -04:00

procmon.h

Bump copyright dates to 2015, in case someday this matters.

2015-01-02 14:27:39 -05:00

sandbox.c

Merge branch 'maint-0.2.7'

2015-12-16 09:07:11 -05:00

sandbox.h

Fix compilation of sandbox.[ch] under musl-libc

2015-10-15 10:37:41 -04:00

testsupport.h

Bump copyright dates to 2015, in case someday this matters.

2015-01-02 14:27:39 -05:00

torgzip.c

Replace usage of INLINE with inline

2015-12-15 11:34:00 -05:00

torgzip.h

Merge remote-tracking branch 'public/feature11791'

2015-01-06 13:52:54 -05:00

torint.h

Prop210: Add schedules for simultaneous client consensus downloads

2015-12-16 04:37:49 +11:00

torlog.h

Whitespace cleanup

2016-01-15 10:57:03 -05:00

tortls.c

Appease "make check-spaces"

2015-12-20 15:00:20 -05:00

tortls.h

Merge remote-tracking branch 'public/ticket11150_client_only'

2015-11-13 09:58:16 -05:00

util_format.c

Replace usage of INLINE with inline

2015-12-15 11:34:00 -05:00

util_format.h

Move formatting functions around.

2015-07-31 11:21:34 -04:00

util_process.c

Replace usage of INLINE with inline

2015-12-15 11:34:00 -05:00

util_process.h

Bump copyright dates to 2015, in case someday this matters.

2015-01-02 14:27:39 -05:00

util.c

Replace usage of INLINE with inline

2015-12-15 11:34:00 -05:00

util.h

Merge branch 'karsten_bug13192_026_03_teor'

2015-11-12 11:40:58 -05:00

workqueue.c

Ensure worker threads actually exit when it is time

2015-08-21 10:36:53 -04:00

workqueue.h

Ensure worker threads actually exit when it is time

2015-08-21 10:36:53 -04:00