]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Sep 2011 00:55:31 +0000 (20:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Sep 2011 00:55:31 +0000 (20:55 -0400)
commit9ef2cd7776ecb91b74c1db58d8fbd9111238f458
tree8902caf218f7207c35eaee8680a8837a2234f27f
parent7ca16affb5722561a5d50b1820328d1833a9099e
parent2bf0e7479bc9ec26496405ff6a1ef830cacc001b
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/connection_edge.c

Conflicted on a router->node transition; fix was easy.
src/or/connection_edge.c