Nick Mathewson f729e1e984 Merge branch 'feature3457-v4-nm-squashed' ...

Conflicts:
	src/or/rendclient.c

2012-01-11 12:10:14 -05:00

..

absolute_cookie_file

changes file for #4881

2012-01-10 14:59:49 -05:00

aes_ctr_test

Test for broken counter-mode at runtime

2012-01-10 11:15:35 -05:00

bug2434

Advertise dirport if accountingmax is large enough

2012-01-10 09:59:36 -05:00

bug4413

Revise bug4413 changes file

2012-01-09 19:18:48 -05:00

bug4650

changes file for bug4650

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

bug4746

changes file for bug4746

2012-01-10 16:53:27 -05:00

bug4856

Fix a trivial log message error in renservice.c

2012-01-09 12:21:04 -05:00

dirauth_log

Log which votes we still need to fetch

2012-01-10 16:13:30 +01:00

feature3457

Include circ creation time in CIRC events, etc.

2011-11-24 06:55:16 -08:00

readable_ssl_versions

We no longer need to detect openssl without RAND_poll()

2012-01-10 10:40:31 -05:00