]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24fbb9a 797ece0)
Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 17:20:51 +0000 (13:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 17:20:51 +0000 (13:20 -0400)

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