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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 25 Oct 2012 14:21:33 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 25 Oct 2012 10:21:58 -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-bounces@xxxxxxxxxxxxxxxxxxxx

commit e4abac08a2ade5329594dcc220a02b3b680cb9e8
Merge: ad49b8a 758428d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 25 10:19:46 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'
    
    (Using an -s ours merge for Not taking the CVE-2012-2250 fix from
    maint-0.2.3; it would conflict.)




_______________________________________________
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 branch 'link_negotiation_assert_024'
Next by Author: [tor-commits] [tor/release-0.2.3] Draft blurb for 0.2.3.24-rc; guess a release date
Previous by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
Next by thread: [tor-commits] [tor/master] properly free the return values of rate_limit_log()
Index(es):
- Author
- Thread