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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 30 Jan 2020 00:45:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 29 Jan 2020 19:45:30 -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 39c5e1b84994c2f226a8530b930f215cc5ffb877
Merge: c1d4399c8 f470b863a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 29 19:44:34 2020 -0500

    Merge branch 'maint-0.4.2'
    
    Use "-s ours" 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/master] or_options_st.h: Add an include and a struct declaration.
Next by Author: [tor-commits] [tor/master] fix a stray asterisk in a comment
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
Index(es):
- Author
- Thread