Nick Mathewson d3063da691 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 ...

Conflicts:
	src/or/config.c
	src/or/relay.c

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

..

address.c

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

2013-03-18 15:28:39 -04:00

address.h

Remove some totally unused functions

2013-02-23 23:31:31 -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

Rename log() to tor_log() for logging

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

compat_libevent.h

Update the copyright date to 201.

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

compat.c

Define SEEK_SET for platforms that lack it.

2013-06-13 21:56:35 -04:00

compat.h

If we write the annotation but not the microdescriptor, rewind.

2013-06-13 12:29:01 -04:00

container.c

Rename *_isin to *_contains

2013-01-16 16:57:11 -05:00

container.h

Remove some totally unused functions

2013-02-23 23:31:31 -05:00

crypto_curve25519.c

Avoid clang warnings from implicit off_t->size_t cast

2013-03-23 18:50:21 -04:00

crypto_curve25519.h

Fix compilation with --disable-curve25519 option

2013-02-04 11:32:55 -05:00

crypto_format.c

Fix compilation with --disable-curve25519 option

2013-02-04 11:32:55 -05:00

crypto.c

Remove a double-newline

2013-04-18 11:14:05 -04:00

crypto.h

Merge branch 'less_charbuf_rebased' into maint-0.2.4

2013-04-18 11:13:36 -04: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

Fix compilation with --disable-curve25519 option

2013-02-04 11:32:55 -05:00

log.c

Merge remote-tracking branch 'public/easy_ratelim'

2013-02-07 17:13:51 -05: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

torgzip.c

Update the copyright date to 201.

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

torgzip.h

Update the copyright date to 201.

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

torint.h

Merge branch '024_msvc_squashed'

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

torlog.h

Merge remote-tracking branch 'public/easy_ratelim'

2013-02-07 17:13:51 -05:00

tortls.c

Track TLS overhead: diagnostic for bug 7707

2013-03-11 22:06:07 -04:00

tortls.h

Track TLS overhead: diagnostic for bug 7707

2013-03-11 22:06:07 -04:00

util_codedigest.c

Resolve about 24 DOCDOCs

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

util.c

Merge branch 'bug8037_squashed' into maint-0.2.4

2013-04-17 10:45:45 -04:00

util.h

Merge branch 'bug8037_squashed' into maint-0.2.4

2013-04-17 10:45:45 -04:00