]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/exitpolicy-multicast'
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Dec 2015 15:23:30 +0000 (10:23 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Dec 2015 15:23:30 +0000 (10:23 -0500)

Trivial merge