]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Mar 2011 21:22:38 +0000 (17:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Mar 2011 21:22:38 +0000 (17:22 -0400)
commitebf6786ab3597ec96ef2c026d7dc32c26fbc84e4
tree4575b3c24b16a928a31700a14db66be6fae0b588
parent50c9d310290886d84c8d2d604279d674042d11c4
parentb97d9abd0940037b249a1ee56724dbfed904263b
Merge remote branch 'origin/maint-0.2.2'

Fixed conflict: router_get_my_routerinfo now returns const

Conflicts:
src/or/router.c
src/or/router.c