[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: Wed, 30 Apr 2014 01:09:04 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 29 Apr 2014 21:09:18 -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 27438ef7c6a34b71165480f4d2c9173278e6d854
Merge: 545e211 35699ef
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Apr 29 21:08:26 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    Doing an "ours" merge to avoid taking 35699ef9f5d2814203653e16c, which is
    a cherry-picked backport of 9686.

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

Prev by Author: [tor-commits] [tor/master] Drop the MaxMemInCellQueues lower limit down to 256 MB.
Next by Author: [tor-commits] [tor/master] Update .gitignore for doc, contrib changes
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