commit 4467799f45346a59c37de9337b24ace361cb8b6a Merge: dfa6cde cb9226b Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 9 12:53:45 2011 -0400

Merge remote-tracking branch 'public/enhance_replay_detection' into maint-0.2.2

changes/replay-firstpart | 13 +++++++++++++ src/or/rendservice.c | 26 +++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-)