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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.4'
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 24 Aug 2018 13:18:38 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 24 Aug 2018 09:18:58 -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 4c939f89ae583008e07071c822abaf55435cb5f1
Merge: f36b3faa7 4748fd23d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Aug 24 09:13:37 2018 -0400

    Merge branch 'maint-0.3.4'
    
    "ours" merge to avoid 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/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
Next by Author: [tor-commits] [tor/master] Forward-port the 0.3.4.6-rc changelog
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4'
Index(es):
- Author
- Thread