]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote branch 'sebastian/bug1525'
authorNick Mathewson <nickm@torproject.org>
Mon, 13 Sep 2010 05:36:31 +0000 (01:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 13 Sep 2010 05:36:31 +0000 (01:36 -0400)
commit286f407cd2ffbbbc41736fe4054faf870a1d96aa
tree348fa1324c12a88cb901a149c25862a1c493a3ad
parentf906e4ab39a365ca6a64e3346719e92ed2065afd
parent22285aa964fd447f5537fa3e0a296a2b6ee405f9
Merge remote branch 'sebastian/bug1525'
src/or/connection_edge.c
src/or/connection_edge.h