]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'teor/routerset-parse-IPv6-literals'
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Oct 2015 11:54:20 +0000 (13:54 +0200)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Oct 2015 11:54:20 +0000 (13:54 +0200)
commit488e9a0502d0f177a00c4bf5f49ec218fdc65870
treeab7424c6f8eee8ca28fea4a61c324f2249f51956
parent0d44679d3bfbaae87ca1d611ad060a0319688418
parent99d2869ab50a97013c1738783f3a7a0deb9d42c2
Merge remote-tracking branch 'teor/routerset-parse-IPv6-literals'

(Minor conflicts)
src/or/routerset.c
src/test/test_routerset.c