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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 31 Jan 2018 15:06:54 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 31 Jan 2018 10:16:51 -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 9bfb6fe3958240172f1133e918d1fc6bd5732532
Merge: cb90defba 5fc0437e7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 31 10:06:49 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

 src/or/consdiffmgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




_______________________________________________
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.2] Use -lresolv in LIBS with rust on OSX.
Next by Author: [tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
Index(es):
- Author
- Thread