commit 4e17c50df8eb486597bd00241fbdc0107e3e2a34 Merge: 0400a06 ffad920 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 20 12:43:02 2014 -0500

Merge remote-tracking branch 'isis/fix/10614_pt-spec-keyid'

pt-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)