diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-19 03:02:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-19 03:02:57 -0400 |
| commit | b6931b010512d3d8cbda24c87a8cf379305e1457 (patch) | |
| tree | 060607817555c9c740826bbf81d7b156ac780f28 /src | |
| parent | a0e9dc9f55a452d78d9d16b4a2fc7d57dafa0409 (diff) | |
| parent | d3bfdd6108d084c77f60b16319f6ef24ac447373 (diff) | |
| download | tor-b6931b010512d3d8cbda24c87a8cf379305e1457.tar tor-b6931b010512d3d8cbda24c87a8cf379305e1457.tar.gz | |
Merge branch 'bug7149' into maint-0.2.3
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/directory.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index f1510b970..f235bf3b4 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3178,6 +3178,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } if (options->HidServDirectoryV2 && + connection_dir_is_encrypted(conn) && !strcmpstart(url,"/tor/rendezvous2/")) { /* Handle v2 rendezvous descriptor fetch request. */ const char *descp; @@ -3364,6 +3365,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, /* Handle v2 rendezvous service publish request. */ if (options->HidServDirectoryV2 && + connection_dir_is_encrypted(conn) && !strcmpstart(url,"/tor/rendezvous2/publish")) { switch (rend_cache_store_v2_desc_as_dir(body)) { case -2: |