]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a87c697 e395783)
Merge remote-tracking branch 'rl1987/bug9812'
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Nov 2014 15:27:12 +0000 (10:27 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Nov 2014 15:27:12 +0000 (10:27 -0500)

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