]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20d4356 c6f1668)
Merge branch 'maint-0.2.4' into release-0.2.4
authorRoger Dingledine <arma@torproject.org>
Thu, 5 Sep 2013 03:46:46 +0000 (23:46 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 5 Sep 2013 03:46:46 +0000 (23:46 -0400)

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