]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 639766d f8c14a9)
Merge branch 'annotate_ifdefs'
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Sep 2017 20:07:37 +0000 (16:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Sep 2017 20:07:37 +0000 (16:07 -0400)

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