commit 584a7deea6507b97e014dc6739b5824057a761a0 Merge: 872d3dd 6c974c5 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 20 11:08:44 2013 -0400

Merge branch 'implement_prop222'

dir-spec.txt | 7 +++++++ proposals/222-remove-client-timestamps.txt | 25 ++++++++++++++++--------- rend-spec.txt | 9 ++++++++- tor-spec.txt | 6 ++++-- 4 files changed, 35 insertions(+), 12 deletions(-)