Nick Mathewson b1bdecd703 Merge branch 'ntor-resquashed' ...

Conflicts:
	src/or/cpuworker.c
	src/or/or.h
	src/test/bench.c

2013-01-03 11:52:41 -05:00

..

bug7157

Update changes file.

2012-12-09 23:58:01 -08:00

bug7799.ratelim

Rate-limit "No circuits are opened" message to once-per-hour

2012-12-26 10:05:45 -05:00

bug7814

Fix a crash bug when running an node without IPv6-exit support.

2012-12-29 01:22:34 -05:00

bug7836

Avoid spurious local-port warnings

2013-01-02 10:37:03 -05:00

clang_enum_warnings

Fix a couple of harmless clang3.2 warnings

2012-12-31 18:23:28 +01:00

dh_benchmarks

Add benchmark for DH handshake and ECDH-P-224/56 handshake

2012-12-25 20:14:07 -05:00

dirguards

Directory guard implementation.

2012-12-25 23:14:43 -05:00

ntor

changes file for the ntor branch

2013-01-03 11:29:48 -05:00

tls_ecdhe

Make ECDHE group configurable: 224 for public, 256 for bridges (default)

2012-12-25 20:22:46 -05:00