]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 286fa94 d73c671)
Merge remote-tracking branch 'public/bug20306_029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Nov 2016 23:51:07 +0000 (18:51 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Nov 2016 23:51:07 +0000 (18:51 -0500)

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