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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/396'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/396'
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 19 Oct 2018 18:29:06 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 19 Oct 2018 14:29:19 -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 275e831ceac6382aafb1186976a3edfadcd0c87e
Merge: 95c3cc2b9 b0c41e3ec
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Oct 19 14:29:01 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/396'

 src/config/mmdb-convert.py | 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.3] Merge branch 'maint-0.2.9' into maint-0.3.3
Next by Author: [tor-commits] [tor/master] Pull detached-signatures code into dirauth.
Previous by thread: [tor-commits] [tor/master] Fix the missing unpack function in mmdb-convert.py
Next by thread: [tor-commits] [webwml/master] Add Maggie to the people page
Index(es):
- Author
- Thread