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

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.2.8'
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 15 Jun 2016 20:46:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 15 Jun 2016 16:46:32 -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 4bcec3bab5b0f93934bfe67093146c7a77fa724f
Merge: 2042080 e718a58
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jun 15 12:55:54 2016 -0400

    Merge branch 'maint-0.2.8'
    
    '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/master] ondrej is no longer making rpms
Next by Author: [tor-commits] [tor/master] Mark src/common tor_assert(0)/tor_fragile_assert() unreached for coverage
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.8'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.8'
Index(es):
- Author
- Thread