]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Wed, 21 Dec 2011 16:20:56 +0000 (11:20 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 21 Dec 2011 16:20:56 +0000 (11:20 -0500)
commitf75660958cc62422d158f9284b7fcfdee9fa9b95
tree74d035018d40eda822bd07663c948d4e8f0bbb0f
parentd7531b2adc6d09e33f9a4a3accc4cf3fe28284d6
parentb5e6bbc01dc5d89285aba8a1440a2f5833e531a5
Merge remote-tracking branch 'origin/maint-0.2.2'
src/or/connection.c