Nick Mathewson 628b735fe3 Merge remote-tracking branch 'rransom-tor/bug3460-v4' ...

Conflicts:
	src/or/rendservice.c

2011-11-29 20:56:39 -05:00

..

bug3460

Ignore timestamps of INTRODUCE2 cells

2011-10-31 05:05:45 -07:00

bug4548

Add a changes file.

2011-11-25 17:44:48 +01:00

bug4584

Add a changes file.

2011-11-27 09:03:37 +01:00

config

Support for a defaults torrc file.

2011-11-27 22:25:52 -05:00

disable_network

New 'DisableNetwork' option to prevent Tor from using the network

2011-11-28 15:44:10 -05:00

intro-point-expiration

Make introduction points expire

2011-10-30 02:17:59 -07:00

per-intro-point-replay-cache

Move the real INTRODUCE2 replay-detection cache into rend_intro_point_t

2011-10-30 04:46:58 -07:00

proposal178

Implement consensus method 12 (proposal 178)

2011-11-27 09:29:33 -05:00

reduce-hs-intro-dh-key-replay-cache-lifetime

Reduce lifetime of DH public key replay-detection cache elements

2011-10-31 05:05:45 -07:00