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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 31 Oct 2013 18:10:38 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 31 Oct 2013 14:10:51 -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: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 8676a08362a192f17f2850359b16933c2a5786dd
Merge: 61029d6 db2c2a6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 31 14:08:57 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    Do an "ours" merge to not take the 0.2.4 fix for #9731




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

Prev by Author: [tor-commits] [tor/master] Don't apply read/write buckets to cpuworker connections
Next by Author: [tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4
Previous by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
Next by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
Index(es):
- Author
- Thread