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

[tor-commits] [atlas/master] Merge branch 'master' of ssh://git-rw.torproject.org/atlas

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [atlas/master] Merge branch 'master' of ssh://git-rw.torproject.org/atlas
From: art@xxxxxxxxxxxxxx
Date: Wed, 4 Apr 2012 00:11:39 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 03 Apr 2012 20:11:56 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: 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: Arturo Filastò <hellais@xxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx

commit 0e75a64069addab96cc518319d7f4cb71b53ad36
Merge: 43bd758 0adeedc
Author: Arturo FilastÃ² <hellais@xxxxxxxxx>
Date:   Tue Apr 3 17:12:50 2012 -0700

    Merge branch 'master' of ssh://git-rw.torproject.org/atlas
    
    Conflicts:
    	js/models/relay.js

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

Prev by Author: [tor-commits] [atlas/master] Avoid setting badexit model attribute to false when true
Next by Author: [tor-commits] [atlas/master] Properly convert time to UTC before doing calculation
Previous by thread: [tor-commits] [torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
Next by thread: [tor-commits] [atlas/master] Properly convert time to UTC before doing calculation
Index(es):
- Author
- Thread