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

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 28 Feb 2017 15:42:30 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 28 Feb 2017 10:55:43 -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 4128a8cabdb530fcbe1dda5a21887d7728e4d752
Merge: 3a60214 b049a5b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 28 10:39:29 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0
    
    This is an "ours" merge to avoid a version bump.




_______________________________________________
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 'bug21420_029_squashed' into maint-0.3.0
Next by Author: [tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
Next by thread: [tor-commits] [tor/maint-0.3.0] Check for micro < 0, rather than checking "minor" twice.
Index(es):
- Author
- Thread