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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 16 Aug 2018 12:37:34 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 16 Aug 2018 08:56:53 -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 936e2aa0de6edb0578e18ad0760a67ad64a448d4
Merge: 4847e2216 c798957b5
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Aug 16 08:37:11 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26932    | 3 +++
 src/or/hs_service.c | 1 +
 2 files changed, 4 insertions(+)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [torspec/master] bandwidth-file-spec: files should be generated atomically
Next by Author: [tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
Previous by thread: [tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
Next by thread: [tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
Index(es):
- Author
- Thread