commit ebc5a935ee4aa0c123829706671a3f43da82f11f Merge: 7647f6d 2f012f1 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 9 11:56:33 2014 -0400

Merge remote-tracking branch 'sebastian/bug13060'

dir-spec.txt | 4 ---- 1 file changed, 4 deletions(-)