[tor-commits] [torspec/master] Mark prop#241 as rejected due to being made obsolete by prop#259.

[isis at torproject.org]

commit 736797870d8ed5dca0867ce6fb2d83a70bfa606f
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sun Feb 28 14:34:09 2016 +0000

    Mark prop#241 as rejected due to being made obsolete by prop#259.
---
 proposals/241-suspicious-guard-turnover.txt |  7 ++++++-
 proposals/proposal-status.txt               | 10 ----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/proposals/241-suspicious-guard-turnover.txt b/proposals/241-suspicious-guard-turnover.txt
index b62866b..004feb1 100644
--- a/proposals/241-suspicious-guard-turnover.txt
+++ b/proposals/241-suspicious-guard-turnover.txt
@@ -2,7 +2,12 @@ Filename: 241-suspicious-guard-turnover.txt
 Title: Resisting guard-turnover attacks
 Author: Aaron Johnson, Nick Mathewson
 Created: 2015-01-27
-Status: Draft
+Status: Rejected
+
+
+This proposal was made obsolete by the introduction of Proposal #259.
+Some of the ideas here have be incorporated into Proposal #259.
+
 
 1. Introduction
 
diff --git a/proposals/proposal-status.txt b/proposals/proposal-status.txt
index 36627b7..737fa6f 100644
--- a/proposals/proposal-status.txt
+++ b/proposals/proposal-status.txt
@@ -375,16 +375,6 @@ again to remind me!
      Needs revisions while we still remember what those revisions are.
      (9/2015)
 
-241  Resisting guard-turnover attacks [DRAFT]
-
-     I wrote this one with good ideas from Aaron Johnson and Rob
-     Jansen.  It describes a way to respond to an important class of
-     attacks where an adversary kills off a targeted user's guards until
-     the user has chosen a guard the attacker controls.  (See the
-     "Sniper Attack") paper.  The defense is tricky, and if not done
-     right, might lead clients to kick themselves off the network out of
-     paranoia. So, this proposal could use more analysis.  (2/2015)
-
 242  Better performance and usability for the MyFamily option [OPEN]
 
      Describes a mechanism for using a new ed25519 signature type to