commit a3c4068aa22c83eb21b641dbe868a1b3edd931ad Merge: e316823 07de4f0 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 20 10:31:47 2015 -0500

Merge remote-tracking branch 'teor/feature-17178-rsos'

proposals/ideas/xxx-rend-single-onion.txt | 460 +++++++++++++++++++++++++++++ 1 file changed, 460 insertions(+)