]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge commit 'origin/maint-0.2.1'
authorNick Mathewson <nickm@torproject.org>
Tue, 15 Sep 2009 23:37:26 +0000 (19:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 15 Sep 2009 23:37:26 +0000 (19:37 -0400)
commited7283d28317fd379f26ea9384eaf91e41bd760a
tree9b9bfd65071142885a52663d2c312cafa4b31672
parentf9226ae03076fc7d2885e9c84e88613d6dbcf867
parent24c740e5fdfa1897b2e8de045d11c419d1e0b5d4
Merge commit 'origin/maint-0.2.1'

Resolved conflicts in:
src/or/circuitbuild.c
ChangeLog
src/or/circuitbuild.c
src/or/routerparse.c