[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: Mon, 25 Jun 2018 18:08:24 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 25 Jun 2018 14:08:37 -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 937c1a3830b117514898adb083b25936da22eb0d
Merge: b059c38d8 6c836b9e8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jun 25 14:08:03 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/maint-0.3.4] Merge remote-tracking branch 'catalyst-github/bug26415_034' into maint-0.3.4
Next by Author: [tor-commits] [tor/master] Fix memory leak in test_sr_setup_commits().
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