]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e908e3a 0d94f78)
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 16 May 2011 20:40:57 +0000 (16:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 May 2011 20:40:57 +0000 (16:40 -0400)
Conflicts:
changes/bug2190
changes/forget-rend-descs-on-newnym


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