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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.0'
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 15 May 2017 22:58:17 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 15 May 2017 19:07:53 -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 9b88254d1e393c92bfa3c9dc47e4049b66cf7844
Merge: a546487 8324631
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 15 18:25:31 2017 -0400

    Merge branch 'maint-0.3.0'
    
    "ours" merge to avoid feature 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 'bug22252_029' into maint-0.3.0
Next by Author: [tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.0'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.0'
Index(es):
- Author
- Thread