Merge branch 'bug11485_026_v2_squashed'
commita3de2dfde6a92c0fe7ca755aa7bc1aa046c463a8
authorNick Mathewson <nickm@torproject.org>
Wed, 28 Jan 2015 19:32:19 +0000 (28 14:32 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 28 Jan 2015 19:32:19 +0000 (28 14:32 -0500)
tree38d94df292b78822def140963b1175c9207c1a57
parentb63bf0925530005f629d6616c67b3a29875bd64b
parentfb523b543a95e6eeb85ee93dcad24e1aeb79328f
Merge branch 'bug11485_026_v2_squashed'
src/or/rendservice.c