]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Tue, 17 May 2011 23:53:06 +0000 (19:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 May 2011 23:53:06 +0000 (19:53 -0400)
commitc240efab86d71d8953a36e0599bfc789ee980b71
tree3e17f14ae221d0fa2da852037b91eace6bd35d33
parente0e8424f1eaf88f1c03a0acbfe09d368d3cbb1be
parentbc89ef0ca8164f9e6e23e73c01bdb4257fdbce7c
Merge remote-tracking branch 'origin/maint-0.2.2'
src/or/config.c
src/or/connection.c