]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commit952ae0ea69214636a426b71581661cf0eb0aaa12
tree03501a163ad03255bc97f0ca508cd9834d5c7d71
parente908e3a332dd469af2facac0846d0dc8349a30d3
parent0d94f78705d5376059cd2b1bdfe96e84067e212f
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
changes/bug2190
changes/forget-rend-descs-on-newnym