commit 41c93e4f7f492043aa231fefc9d952f2b5f017fb Merge: 2ac6513 70d87e5 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Mar 15 11:50:44 2013 -0400 Merge branch 'bug4608_v2' rend-spec.txt | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-)