]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f33a5b 51b5d09)
Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:39:40 +0000 (12:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:39:40 +0000 (12:39 -0400)

Trivial merge
Mirror of https://git.torproject.org/tor.git