[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [curriculum/master] Merge branch 'master' of ssh://TorGit/user/colin/curriculum
From: colin@xxxxxxxxxxxxxx
Date: Mon, 29 Jun 2015 08:07:02 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 29 Jun 2015 04:07:33 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Colin Childs <colin@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

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

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




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

Prev by Author: [tor-commits] [curriculum/master] Drop tails module
Next by Author: [tor-commits] [curriculum/master] Add TODO file
Previous by thread: [tor-commits] [curriculum/master] Drop tails module
Next by thread: [tor-commits] [curriculum/master] Add TODO file
Index(es):
- Author
- Thread