aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-02-11 15:06:04 -0500
committerNick Mathewson <nickm@torproject.org>2015-02-11 15:06:04 -0500
commitcaf28519d9a4f7f0a5fa36a0cd94fe9c0ee292dc (patch)
treedb5e6003cc8cec5f27ba0e91449348518ea98455 /changes
parent0c81dfa848da160b02818771626a425cd27b86bc (diff)
parent0899f51bc6abf535c6c55b81b98b959235b0f7c7 (diff)
downloadtor-caf28519d9a4f7f0a5fa36a0cd94fe9c0ee292dc.tar.gz
tor-caf28519d9a4f7f0a5fa36a0cd94fe9c0ee292dc.zip
Merge branch 'bug12844'
Conflicts: src/or/circuituse.c src/test/include.am src/test/test_entrynodes.c
Diffstat (limited to 'changes')
-rw-r--r--changes/feature128445
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/feature12844 b/changes/feature12844
new file mode 100644
index 0000000000..7b7276640a
--- /dev/null
+++ b/changes/feature12844
@@ -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.