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

[tor-commits] [tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 28 Feb 2017 15:42:25 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 28 Feb 2017 10:43:09 -0500
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 b2b604ecb4df95526a309c9ff507dff942472daa
Merge: aeb299b 4bab288
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 28 10:22:36 2017 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5
    
    "ours" merge to avoid bumping version




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

Prev by Author: [tor-commits] [tor/maint-0.3.0] Use bash in src/test/test-network.sh
Next by Author: [tor-commits] [tor/release-0.2.9] Merge branch 'bug21108_029' into maint-0.2.9
Previous by thread: [tor-commits] [tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
Next by thread: [tor-commits] [tor/maint-0.2.5] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix
Index(es):
- Author
- Thread