Nick Mathewson 1aab5b6b39 Merge remote-tracking branch 'public/bug1666' ...

Conflicts:
	doc/spec/socks-extensions.txt
	src/or/buffers.c
	src/or/config.c
	src/or/connection_edge.c

2011-07-13 12:12:16 -04:00

..

Makefile.am

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

2011-06-22 18:15:27 -04:00

test_addr.c

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

2011-06-14 12:25:33 -04:00

test_containers.c

Bump copyright statements to 2011 (0.2.2)

2011-01-03 11:52:09 -05:00

test_crypto.c

Prefer tt_assert in unit tests, not tor_assert

2011-06-08 20:33:53 -04:00

test_data.c

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

2011-01-03 11:51:17 -05:00

test_dir.c

Upgrade to the latest version of tinytest

2011-06-09 17:30:09 -04:00

test_microdesc.c

Make the get_options() return const

2011-06-14 13:17:06 -04:00

test_util.c

Prefer tt_assert in unit tests, not tor_assert

2011-06-08 20:33:53 -04:00

test-child.c

Fix running unit tests from outside of the build directory (fixes bug #2051)

2010-10-11 23:29:52 +01:00

test.c

Merge remote-tracking branch 'public/bug1666'

2011-07-13 12:12:16 -04:00

test.h

Upgrade to the latest version of tinytest

2011-06-09 17:30:09 -04:00

tinytest_demo.c

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

2011-06-22 18:15:27 -04:00

tinytest_macros.h

Upgrade to the latest version of tinytest

2011-06-09 17:30:09 -04:00

tinytest.c

Upgrade to the latest version of tinytest

2011-06-09 17:30:09 -04:00

tinytest.h

Update to the latest tinytest version

2010-09-09 14:34:10 -04:00