]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d0c7a1 ebf243b)
Merge remote-tracking branch 'teor/bug20864-029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 5 Dec 2016 13:10:48 +0000 (08:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 5 Dec 2016 13:10:48 +0000 (08:10 -0500)

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