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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 2 Jan 2018 15:10:35 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 02 Jan 2018 10:29:59 -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 fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7
Merge: 08469a338 8a7767603
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jan 2 10:10:28 2018 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug24736  | 6 ++++++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




_______________________________________________
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] hs-v3: Remove a BUG() when storing a descriptor in the client cache
Next by Author: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-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