[tor-commits] [tor/master] Fix compilation from 2841 branch

[nickm at torproject.org]

commit 616d85fdd8fb27549ec0bba519bfba9384f33cc1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 11 15:59:03 2011 -0400

    Fix compilation from 2841 branch
---
 src/or/connection.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index dbe294a..5dbf052 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -4139,7 +4139,7 @@ int
 get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type,
                    const connection_t *conn)
 {
-  or_options_t *options = get_options();
+  const or_options_t *options = get_options();
 
   if (options->HTTPSProxy) {
     tor_addr_copy(addr, &options->HTTPSProxyAddr);
@@ -4179,7 +4179,7 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type,
 static int
 get_proxy_type(void)
 {
-  or_options_t *options = get_options();
+  const or_options_t *options = get_options();
 
   if (options->HTTPSProxy)
     return PROXY_CONNECT;