[tor-commits] [curriculum/master] Merge branch 'master' of ssh://TorGit/user/colin/curriculum

colin at torproject.org colin at torproject.org
Mon Jun 29 08:07:02 UTC 2015

Previous message: [tor-commits] [curriculum/master] Drop tails module
Next message: [tor-commits] [curriculum/master] Merge branch 'torbrowser_visual_update'
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit 6a05b0e6153147dde5d93b6949e33f3e863545af
Merge: 9f04f26 91f3114
Author: Colin Childs <colin at torproject.org>
Date:   Sun Jun 28 17:47:59 2015 -0500

    Merge branch 'master' of ssh://TorGit/user/colin/curriculum
    
    Conflicts:
    	module4/module4.tex

Previous message: [tor-commits] [curriculum/master] Drop tails module
Next message: [tor-commits] [curriculum/master] Merge branch 'torbrowser_visual_update'
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the tor-commits mailing list