]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.7'
authorNick Mathewson <nickm@torproject.org>
Tue, 29 Sep 2015 10:49:59 +0000 (12:49 +0200)
committerNick Mathewson <nickm@torproject.org>
Tue, 29 Sep 2015 10:49:59 +0000 (12:49 +0200)

Trivial merge