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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 2 Nov 2018 13:09:05 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 02 Nov 2018 15:04:44 -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 ff05162710cb514b3c0c054b034dc9c2bd66e97d
Merge: bbdf56aed d8d4fe83d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Nov 2 09:08:53 2018 -0400

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "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] Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
Next by Author: [tor-commits] [tor/release-0.3.5] Merge branch 'bug26470_032' into maint-0.3.3
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
Index(es):
- Author
- Thread