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

[tor-commits] [tor/maint-0.4.0] Merge branch 'bug30184_029' into bug30184_034

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.4.0] Merge branch 'bug30184_029' into bug30184_034
From: teor@xxxxxxxxxxxxxx
Date: Fri, 9 Aug 2019 21:29:22 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 09 Aug 2019 17:32: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: teor <teor@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit dfdd877647ef496b2b4a82e8c1e6040692ecebb5
Merge: 48e990359 031ed59db
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Wed Apr 17 11:51:32 2019 +1000

    Merge branch 'bug30184_029' into bug30184_034
    
    "ours" merge, because 0.3.4 has a different set of changes,
    which already compile.




_______________________________________________
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.5] Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
Next by Author: [tor-commits] [tor/maint-0.2.9] Travis: control "make check" with its own flag
Previous by thread: [tor-commits] [tor/maint-0.4.0] test/relay: add a missing typedef
Next by thread: [tor-commits] [tor/maint-0.4.0] dirparse: Stop crashing when parsing unknown descriptor purpose annotations
Index(es):
- Author
- Thread