]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3890c81 2b4d4ff)
Merge branch 'bug2474'
authorNick Mathewson <nickm@torproject.org>
Wed, 23 Nov 2011 22:14:54 +0000 (17:14 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 23 Nov 2011 22:14:54 +0000 (17:14 -0500)
commitf067067ee66e104b2d1e97fb881bf6d2277ea589
tree3f1b059e7f3d43d494289ab956029f840c2ffad1tree | snapshot
parent3890c81e7c4eaa3350fe569dbc2fbf97e824e4c0commit | diff
parent2b4d4ffa8f2d893cf5df1480aa2db86e75e8292acommit | diff
Merge branch 'bug2474'

Had to resolve conflicts wrt the " (using bufferevents)" addition to the
startup string.

Conflicts:
src/or/main.c
src/or/main.c diff1 | diff2 | blob | history
Mirror of https://git.torproject.org/tor.git