Nick Mathewson 3b88b63826 Merge branch 'bug933_nm_rebased_v2' %!s(int64=14) %!d(string=hai) anos
..
bug3460 272dd90b5c Ignore timestamps of INTRODUCE2 cells %!s(int64=14) %!d(string=hai) anos
bug3786 192de441e0 Add changes file. %!s(int64=14) %!d(string=hai) anos
bug4529 3ebe960f3f Detect tor_addr_to_str failure in tor_dup_addr. %!s(int64=14) %!d(string=hai) anos
bug4548 e2a189053d Add a changes file. %!s(int64=14) %!d(string=hai) anos
bug4584 efba71b03c Add a changes file. %!s(int64=14) %!d(string=hai) anos
bug933 c6d8c6baaa bug933 - Match against super-domains in MapAddress %!s(int64=14) %!d(string=hai) anos
config 230422b955 Support for a defaults torrc file. %!s(int64=14) %!d(string=hai) anos
disable_network df9b76460c New 'DisableNetwork' option to prevent Tor from using the network %!s(int64=14) %!d(string=hai) anos
intro-point-expiration 1eba4f0cc3 Make introduction points expire %!s(int64=14) %!d(string=hai) anos
per-intro-point-replay-cache 1a52a947c5 Move the real INTRODUCE2 replay-detection cache into rend_intro_point_t %!s(int64=14) %!d(string=hai) anos
proposal178 e5e4bfd167 Implement consensus method 12 (proposal 178) %!s(int64=14) %!d(string=hai) anos
reduce-hs-intro-dh-key-replay-cache-lifetime 60ed98e184 Reduce lifetime of DH public key replay-detection cache elements %!s(int64=14) %!d(string=hai) anos