Nick Mathewson a37cbfdafc Merge remote-tracking branch 'origin/patches-2.0' ...

Conflicts:
	configure.in

2012-02-14 15:44:03 -05:00

..

bench_cascade.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

bench_http.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

bench_httpclient.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

bench.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

Makefile.am

Changed OPENSSL_LDFLAGS to OPENSSL_LIBADD

2012-02-14 15:37:58 -05:00

Makefile.nmake

Merge remote-tracking branch 'origin/patches-2.0'

2011-06-14 15:15:43 -04:00

regress_buffer.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_bufferevent.c

Add a bufferevent_getcb() to find a bufferevent's current callbacks

2012-02-11 12:04:15 -05:00

regress_dns.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_et.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_http.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_iocp.c

Update copyright notices to 2012

2012-02-10 17:29:53 -05:00

regress_listener.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_main.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_minheap.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_rpc.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_ssl.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_testutils.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_testutils.h

Update copyright notices to 2012

2012-02-10 17:29:53 -05:00

regress_thread.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_util.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress_zlib.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress.h

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

regress.rpc

Allow C identifiers as struct names; allow multiple comments in .rpc files; from Zack Weinberg; plus a tiny tweak

2009-07-03 17:43:26 +00:00

rpcgen_wrapper.sh

Try to fix 'make distcheck' errors when building out-of-tree

2011-08-17 22:04:38 -04:00

test-changelist.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

test-eof.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

test-init.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

test-ratelim.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

test-ratelim.sh

Make test.sh exit with nonzero status if tests fail

2010-05-26 13:43:01 -04:00

test-time.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

test-weof.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-02-10 17:33:50 -05:00

test.sh

Fix a test-call accidentally in the last commit

2011-07-05 14:43:24 -04:00

tinytest_demo.c

Merge in a punctuation fix from upstream tinytest

2012-02-13 17:30:46 -05:00

tinytest_local.h

When including an -internal.h header outside the main tree, do so early

2012-01-24 16:08:00 -05:00

tinytest_macros.h

Synchronize with upstream tinytest

2012-02-13 17:49:17 -05:00

tinytest.c

Synchronize with upstream tinytest

2012-02-13 17:49:17 -05:00

tinytest.h

Synchronize with upstream tinytest

2012-02-13 17:49:17 -05:00