commit e80b15b4c03d7cee964214744efbbac29ae9b6cf Merge: 59e4c5e 26929b8 Author: Nick Mathewson <[email protected]> Date: Wed Apr 1 12:52:57 2015 -0400
Merge remote-tracking branch 'karsten/task-15276'
dir-spec.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
