]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2079ec9 1a7f6df)
Merge remote-tracking branch 'gtank/feature17663'
authorNick Mathewson <nickm@torproject.org>
Wed, 25 Nov 2015 14:00:01 +0000 (09:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 Nov 2015 14:00:01 +0000 (09:00 -0500)

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