]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caf7422 44f3563)
Merge remote-tracking branch 'teor/bug20634_029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Nov 2016 01:02:59 +0000 (20:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Nov 2016 01:02:59 +0000 (20:02 -0500)

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