]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4b793f e51f105)
Merge branch 'bug20534_029_squashed' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 16:01:31 +0000 (11:01 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 16:01:31 +0000 (11:01 -0500)

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