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

[tor-commits] [tor/master] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 22 Feb 2011 20:58:42 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 22 Feb 2011 15:59:03 -0500
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: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx

commit 84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a
Merge: 4f730e4 7605985
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 22 15:57:36 2011 -0500

    Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
    
    Use "ours" strategy" to avoid taking bug2402 fix.




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

Prev by Author: [tor-commits] [tor/master] Merge remote branch 'public/bug2402_nothing' into maint-0.2.1
Next by Author: [tor-commits] [tor/master] changes file for removing torspec from the tarball
Previous by thread: [tor-commits] [tor/master] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Next by thread: [tor-commits] [tor/master] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Index(es):
- Author
- Thread