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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 12 Sep 2017 13:24:39 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 12 Sep 2017 09:25:19 -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 469189d84a9b968be7a296c42ac540bf31824124
Merge: eaa8224ce 0729ba286
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 12 09:24:20 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid torgzip.c change, since torgzip has been replaced.

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

Prev by Author: [tor-commits] [tor/release-0.3.0] Merge branch 'trove-2017-008_030' into maint-0.3.0
Next by Author: [tor-commits] [tor/master] Merge branch 'annotate_ifdefs'
Previous by thread: [tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
Next by thread: [tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
Index(es):
- Author
- Thread