Nick Mathewson 2308f917f9 Merge remote-tracking branch 'andrea/ticket15358_squashed_2'

2015-05-18 14:44:28 -04:00

..

.dummy

Add a .dummy file in the changes directory to stop git from removing it

2015-05-11 11:41:48 -04:00

bug15881

Add missing descriptor ID to HS_DESC control event

2015-05-14 10:46:38 -04:00

bug16060

Fix crash on HUP with mixed ephemeral services

2015-05-16 20:01:38 -06:00

ticket15358

Changes file for ticket 15358

2015-05-17 13:58:05 +00:00