[tor-commits] [torspec/master] Merge remote-tracking branch 'karsten/task-5848'

[nickm@xxxxxxxxxxxxxx]

commit fe30978a4debefb1973b6f7f719d2fb832224bf3
Merge: f72544e 4bbba5c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jun 13 10:19:26 2012 -0400

    Merge remote-tracking branch 'karsten/task-5848'

 dir-spec.txt |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits