commit 42b4c0d96098167924dcf4694fcbdb68cd24e5dd Merge: 42b373a 8bc6db6 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 8 14:45:06 2014 -0400

Merge branch 'rsa1024_migrate'

proposals/230-rsa1024-relay-id-migration.txt | 83 ++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)