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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 9 Jul 2018 13:24:53 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 09 Jul 2018 09:25:12 -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 afee785417cba083c4914fd9b6db49498c2eb241
Merge: 9320100d6 532873a92
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jul 9 09:24:14 2018 -0400

    Merge branch 'maint-0.3.3' into 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.4] Merge branch 'maint-0.3.3' into maint-0.3.4
Next by Author: [tor-commits] [tor/master] Rename bwlist to bw_file and banwidth to
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
Index(es):
- Author
- Thread