user/sysrqb/tor, branch master Matt's tor repository Fix: init HSDirs list in rend_data_service_create 2015-05-14T15:09:02+00:00 David Goulet dgoulet@ev0ke.net 2015-05-14T14:56:14+00:00 2aaaf7b145e818835e4e0d17e9aed14213b8b0ee Signed-off-by: David Goulet <dgoulet@ev0ke.net> 
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
Merge branch 'bug15880_027_03' 2015-05-14T14:46:45+00:00 Nick Mathewson nickm@torproject.org 2015-05-14T14:46:45+00:00 d05d21c89a21695ba9de32140ff13c68610b39f0 






Test: fix HS_DESC to expect descriptor ID
2015-05-14T14:46:38+00:00

David Goulet
dgoulet@ev0ke.net

2015-05-12T20:45:56+00:00

acfa374048cfbf7f632ecaba8355826366e4ed1f

With #15881 implemented, this adds the missing descriptor ID at the end of
the expected control message.

Signed-off-by: David Goulet <dgoulet@ev0ke.net>





With #15881 implemented, this adds the missing descriptor ID at the end of
the expected control message.

Signed-off-by: David Goulet <dgoulet@ev0ke.net>







Add missing descriptor ID to HS_DESC control event
2015-05-14T14:46:38+00:00

David Goulet
dgoulet@ev0ke.net

2015-04-30T16:28:11+00:00

c1ffeadff4db375886d40bb5928ddd4fe761ba9f

For FAILED and RECEIVED action of the HS_DESC event, we now sends back the
descriptor ID at the end like specified in the control-spec section 4.1.25.

Fixes #15881

Signed-off-by: David Goulet <dgoulet@ev0ke.net>





For FAILED and RECEIVED action of the HS_DESC event, we now sends back the
descriptor ID at the end like specified in the control-spec section 4.1.25.

Fixes #15881

Signed-off-by: David Goulet <dgoulet@ev0ke.net>







Fix rend_config_services() indentation
2015-05-14T14:27:04+00:00

David Goulet
dgoulet@ev0ke.net

2015-05-11T20:16:41+00:00

6346d73b8efd030436f69b905c0956e24dcb036f

Not sure what happened but whitespace gone wild! :)

Signed-off-by: David Goulet <dgoulet@ev0ke.net>





Not sure what happened but whitespace gone wild! :)

Signed-off-by: David Goulet <dgoulet@ev0ke.net>







Use safe_str_client() for service ID in log
2015-05-14T14:26:57+00:00

David Goulet
dgoulet@ev0ke.net

2015-05-11T20:19:16+00:00

b6e7b57d9ad7a756a12e90df1ff5c81cc6cb9acd

Scrub the service ID in a warning log.

Signed-off-by: David Goulet <dgoulet@ev0ke.net>





Scrub the service ID in a warning log.

Signed-off-by: David Goulet <dgoulet@ev0ke.net>







Merge remote-tracking branch 'origin/maint-0.2.6'
2015-05-13T15:06:10+00:00

Nick Mathewson
nickm@torproject.org

2015-05-13T15:06:10+00:00

113dc51020bc6e6cf4702ac55e3bf17f3833fe99












Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-05-13T15:05:33+00:00

Nick Mathewson
nickm@torproject.org

2015-05-13T15:05:33+00:00

614d9bc9674cfb7807b0423bb43fc1c184501144












Merge remote-tracking branch 'origin/maint-0.2.5'
2015-05-13T15:04:17+00:00

Nick Mathewson
nickm@torproject.org

2015-05-13T15:04:17+00:00

b76314d3a1430f4440dcbec4f5026564981f2030












Merge branch 'bug15823_025' into maint-0.2.5
2015-05-13T15:03:05+00:00

Nick Mathewson
nickm@torproject.org

2015-05-13T15:03:05+00:00

8aa04408fb724d55e95419ec9f0568c7d733acb5