Merge branch 'bug12844'

Conflicts:
	src/or/circuituse.c
	src/test/include.am
	src/test/test_entrynodes.c
This commit is contained in:
Nick Mathewson
2015-02-11 15:06:04 -05:00
14 changed files with 305 additions and 70 deletions
+5
View File
@@ -0,0 +1,5 @@
o Minor features:
- Introduce the config option Tor2webRendezvousPoints, which
allows clients in Tor2webMode to select a specific Rendezvous
Point to be used in HS circuits. This might allow better
performance for Tor2Web nodes. Implements ticket #12844.