]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'sebastian/geoipnotice'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Jun 2009 16:09:57 +0000 (12:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Jun 2009 16:09:57 +0000 (12:09 -0400)

Trivial merge